2 files changed, 43 insertions, 43 deletions

diff --git a/Makefile b/Makefile
index a7cd04f..daac40b 100644
--- a/Makefile
+++ b/Makefile
@@ -4,71 +4,71 @@
 include config.mk
 
 SRC = drw.c dmenu.c stest.c util.c
-OBJ = ${SRC:.c=.o}
+OBJ = $(SRC:.c=.o)
 
 all: options dmenu stest
 
 options:
         @echo dmenu build options:
-        @echo "CFLAGS   = ${CFLAGS}"
-        @echo "LDFLAGS  = ${LDFLAGS}"
-        @echo "CC       = ${CC}"
+        @echo "CFLAGS   = $(CFLAGS)"
+        @echo "LDFLAGS  = $(LDFLAGS)"
+        @echo "CC       = $(CC)"
 
 .c.o:
         @echo CC $<
-        @${CC} -c ${CFLAGS} $<
+        @$(CC) -c $(CFLAGS) $<
 
 config.h:
         @echo creating $@ from config.def.h
         @cp config.def.h $@
 
-${OBJ}: arg.h config.h config.mk drw.h
+$(OBJ): arg.h config.h config.mk drw.h
 
 dmenu: dmenu.o drw.o util.o
         @echo CC -o $@
-        @${CC} -o $@ dmenu.o drw.o util.o ${LDFLAGS}
+        @$(CC) -o $@ dmenu.o drw.o util.o $(LDFLAGS)
 
 stest: stest.o
         @echo CC -o $@
-        @${CC} -o $@ stest.o ${LDFLAGS}
+        @$(CC) -o $@ stest.o $(LDFLAGS)
 
 clean:
         @echo cleaning
-        @rm -f dmenu stest ${OBJ} dmenu-${VERSION}.tar.gz
+        @rm -f dmenu stest $(OBJ) dmenu-$(VERSION).tar.gz
 
 dist: clean
         @echo creating dist tarball
-        @mkdir -p dmenu-${VERSION}
+        @mkdir -p dmenu-$(VERSION)
         @cp LICENSE Makefile README arg.h config.def.h config.mk dmenu.1 \
-                drw.h util.h dmenu_path dmenu_run stest.1 ${SRC} \
-                dmenu-${VERSION}
-        @tar -cf dmenu-${VERSION}.tar dmenu-${VERSION}
-        @gzip dmenu-${VERSION}.tar
-        @rm -rf dmenu-${VERSION}
+                drw.h util.h dmenu_path dmenu_run stest.1 $(SRC) \
+                dmenu-$(VERSION)
+        @tar -cf dmenu-$(VERSION).tar dmenu-$(VERSION)
+        @gzip dmenu-$(VERSION).tar
+        @rm -rf dmenu-$(VERSION)
 
 install: all
-        @echo installing executables to ${DESTDIR}${PREFIX}/bin
-        @mkdir -p ${DESTDIR}${PREFIX}/bin
-        @cp -f dmenu dmenu_path dmenu_run stest ${DESTDIR}${PREFIX}/bin
-        @chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu
-        @chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu_path
-        @chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu_run
-        @chmod 755 ${DESTDIR}${PREFIX}/bin/stest
-        @echo installing manual pages to ${DESTDIR}${MANPREFIX}/man1
-        @mkdir -p ${DESTDIR}${MANPREFIX}/man1
-        @sed "s/VERSION/${VERSION}/g" < dmenu.1 > ${DESTDIR}${MANPREFIX}/man1/dmenu.1
-        @sed "s/VERSION/${VERSION}/g" < stest.1 > ${DESTDIR}${MANPREFIX}/man1/stest.1
-        @chmod 644 ${DESTDIR}${MANPREFIX}/man1/dmenu.1
-        @chmod 644 ${DESTDIR}${MANPREFIX}/man1/stest.1
+        @echo installing executables to $(DESTDIR)$(PREFIX)/bin
+        @mkdir -p $(DESTDIR)$(PREFIX)/bin
+        @cp -f dmenu dmenu_path dmenu_run stest $(DESTDIR)$(PREFIX)/bin
+        @chmod 755 $(DESTDIR)$(PREFIX)/bin/dmenu
+        @chmod 755 $(DESTDIR)$(PREFIX)/bin/dmenu_path
+        @chmod 755 $(DESTDIR)$(PREFIX)/bin/dmenu_run
+        @chmod 755 $(DESTDIR)$(PREFIX)/bin/stest
+        @echo installing manual pages to $(DESTDIR)$(MANPREFIX)/man1
+        @mkdir -p $(DESTDIR)$(MANPREFIX)/man1
+        @sed "s/VERSION/$(VERSION)/g" < dmenu.1 > $(DESTDIR)$(MANPREFIX)/man1/dmenu.1
+        @sed "s/VERSION/$(VERSION)/g" < stest.1 > $(DESTDIR)$(MANPREFIX)/man1/stest.1
+        @chmod 644 $(DESTDIR)$(MANPREFIX)/man1/dmenu.1
+        @chmod 644 $(DESTDIR)$(MANPREFIX)/man1/stest.1
 
 uninstall:
-        @echo removing executables from ${DESTDIR}${PREFIX}/bin
-        @rm -f ${DESTDIR}${PREFIX}/bin/dmenu
-        @rm -f ${DESTDIR}${PREFIX}/bin/dmenu_path
-        @rm -f ${DESTDIR}${PREFIX}/bin/dmenu_run
-        @rm -f ${DESTDIR}${PREFIX}/bin/stest
-        @echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
-        @rm -f ${DESTDIR}${MANPREFIX}/man1/dmenu.1
-        @rm -f ${DESTDIR}${MANPREFIX}/man1/stest.1
+        @echo removing executables from $(DESTDIR)$(PREFIX)/bin
+        @rm -f $(DESTDIR)$(PREFIX)/bin/dmenu
+        @rm -f $(DESTDIR)$(PREFIX)/bin/dmenu_path
+        @rm -f $(DESTDIR)$(PREFIX)/bin/dmenu_run
+        @rm -f $(DESTDIR)$(PREFIX)/bin/stest
+        @echo removing manual page from $(DESTDIR)$(MANPREFIX)/man1
+        @rm -f $(DESTDIR)$(MANPREFIX)/man1/dmenu.1
+        @rm -f $(DESTDIR)$(MANPREFIX)/man1/stest.1
 
 .PHONY: all options clean dist install uninstall
diff --git a/config.mk b/config.mk
index 50fe52c..528704c 100644
--- a/config.mk
+++ b/config.mk
@@ -3,7 +3,7 @@ VERSION = 4.8
 
 # paths
 PREFIX = /usr/local
-MANPREFIX = ${PREFIX}/share/man
+MANPREFIX = $(PREFIX)/share/man
 
 X11INC = /usr/X11R6/include
 X11LIB = /usr/X11R6/lib
@@ -16,16 +16,16 @@ XINERAMAFLAGS = -DXINERAMA
 FREETYPELIBS = -lfontconfig -lXft
 FREETYPEINC = /usr/include/freetype2
 # OpenBSD (uncomment)
-#FREETYPEINC = ${X11INC}/freetype2
+#FREETYPEINC = $(X11INC)/freetype2
 
 # includes and libs
-INCS = -I${X11INC} -I${FREETYPEINC}
-LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
+INCS = -I$(X11INC) -I$(FREETYPEINC)
+LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS)
 
 # flags
-CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
-CFLAGS   = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
-LDFLAGS  = -s ${LIBS}
+CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS)
+CFLAGS   = -std=c99 -pedantic -Wall -Os $(INCS) $(CPPFLAGS)
+LDFLAGS  = -s $(LIBS)
 
 # compiler and linker
 CC = cc