Escape -s in dmenu.1

[dmenu.git] / Makefile

diff --git a/Makefile b/Makefile
index d170037..3869f4d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # dmenu - dynamic menu
 # dmenu - dynamic menu

-#   (C)opyright MMVI Anselm R. Garbe
+#   (C)opyright MMVI-MMVII Anselm R. Garbe

 
 include config.mk
 
 
 include config.mk
 


@@ -7,7 +7,6 @@ SRC = draw.c main.c util.c
 OBJ = ${SRC:.c=.o}
 
 all: options dmenu
 OBJ = ${SRC:.c=.o}
 
 all: options dmenu

-       @echo finished

 
 options:
        @echo dmenu build options:
 
 options:
        @echo dmenu build options:


@@ -19,14 +18,10 @@ options:
        @echo CC $<
        @${CC} -c ${CFLAGS} $<
 
        @echo CC $<
        @${CC} -c ${CFLAGS} $<
 

-${OBJ}: dmenu.h config.h
-
-config.h:
-       @echo creating $@ from config.default.h
-       @cp config.default.h $@
+${OBJ}: dmenu.h config.mk

 
 dmenu: ${OBJ}
 
 dmenu: ${OBJ}

-       @echo LD $@
+       @echo CC -o $@

        @${CC} -o $@ ${OBJ} ${LDFLAGS}
        @strip $@
 
        @${CC} -o $@ ${OBJ} ${LDFLAGS}
        @strip $@
 


@@ -37,8 +32,7 @@ clean:
 dist: clean
        @echo creating dist tarball
        @mkdir -p dmenu-${VERSION}
 dist: clean
        @echo creating dist tarball
        @mkdir -p dmenu-${VERSION}

-       @cp -R LICENSE Makefile README config.*.h config.mk \
-               dmenu.1 dmenu.h ${SRC} dmenu-${VERSION}
+       @cp -R LICENSE Makefile README config.mk dmenu.1 dmenu.h dmenu_path ${SRC} dmenu-${VERSION}

        @tar -cf dmenu-${VERSION}.tar dmenu-${VERSION}
        @gzip dmenu-${VERSION}.tar
        @rm -rf dmenu-${VERSION}
        @tar -cf dmenu-${VERSION}.tar dmenu-${VERSION}
        @gzip dmenu-${VERSION}.tar
        @rm -rf dmenu-${VERSION}


@@ -46,16 +40,17 @@ dist: clean
 install: all
        @echo installing executable file to ${DESTDIR}${PREFIX}/bin
        @mkdir -p ${DESTDIR}${PREFIX}/bin
 install: all
        @echo installing executable file to ${DESTDIR}${PREFIX}/bin
        @mkdir -p ${DESTDIR}${PREFIX}/bin

-       @cp -f dmenu ${DESTDIR}${PREFIX}/bin
+       @cp -f dmenu dmenu_path ${DESTDIR}${PREFIX}/bin

        @chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu
        @chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu

+       @chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu_path

        @echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
        @mkdir -p ${DESTDIR}${MANPREFIX}/man1
        @echo installing manual page 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" < dmenu.1 > ${DESTDIR}${MANPREFIX}/man1/dmenu.1

        @chmod 644 ${DESTDIR}${MANPREFIX}/man1/dmenu.1
 
 uninstall:
        @echo removing executable file from ${DESTDIR}${PREFIX}/bin
        @chmod 644 ${DESTDIR}${MANPREFIX}/man1/dmenu.1
 
 uninstall:
        @echo removing executable file from ${DESTDIR}${PREFIX}/bin

-       @rm -f ${DESTDIR}${PREFIX}/bin/dmenu
+       @rm -f ${DESTDIR}${PREFIX}/bin/dmenu ${DESTDIR}${PREFIX}/bin/dmenu_path

        @echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
        @rm -f ${DESTDIR}${MANPREFIX}/man1/dmenu.1
 
        @echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
        @rm -f ${DESTDIR}${MANPREFIX}/man1/dmenu.1