Move screen unlocking inside cleanup()

[slock.git] / Makefile

diff --git a/Makefile b/Makefile
index 2036f04..8b3e248 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
 # slock - simple screen locker
 # slock - simple screen locker

-# © 2006-2007 Anselm R. Garbe, Sander van Dijk
+# See LICENSE file for copyright and license details.

 
 include config.mk
 
 
 include config.mk
 

-SRC = slock.c
+SRC = slock.c ${COMPATSRC}

 OBJ = ${SRC:.c=.o}
 
 all: options slock
 OBJ = ${SRC:.c=.o}
 
 all: options slock


@@ -18,7 +18,11 @@ options:
        @echo CC $<
        @${CC} -c ${CFLAGS} $<
 
        @echo CC $<
        @${CC} -c ${CFLAGS} $<
 

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

 
 slock: ${OBJ}
        @echo CC -o $@
 
 slock: ${OBJ}
        @echo CC -o $@


@@ -31,7 +35,8 @@ clean:
 dist: clean
        @echo creating dist tarball
        @mkdir -p slock-${VERSION}
 dist: clean
        @echo creating dist tarball
        @mkdir -p slock-${VERSION}

-       @cp -R LICENSE Makefile README config.mk ${SRC} slock-${VERSION}
+       @cp -R LICENSE Makefile README config.def.h config.mk ${SRC} \
+               explicit_bzero.c slock.1 slock-${VERSION}

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


@@ -42,9 +47,15 @@ install: all
        @cp -f slock ${DESTDIR}${PREFIX}/bin
        @chmod 755 ${DESTDIR}${PREFIX}/bin/slock
        @chmod u+s ${DESTDIR}${PREFIX}/bin/slock
        @cp -f slock ${DESTDIR}${PREFIX}/bin
        @chmod 755 ${DESTDIR}${PREFIX}/bin/slock
        @chmod u+s ${DESTDIR}${PREFIX}/bin/slock

+       @echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
+       @mkdir -p ${DESTDIR}${MANPREFIX}/man1
+       @sed "s/VERSION/${VERSION}/g" <slock.1 >${DESTDIR}${MANPREFIX}/man1/slock.1
+       @chmod 644 ${DESTDIR}${MANPREFIX}/man1/slock.1

 
 uninstall:
        @echo removing executable file from ${DESTDIR}${PREFIX}/bin
        @rm -f ${DESTDIR}${PREFIX}/bin/slock
 
 uninstall:
        @echo removing executable file from ${DESTDIR}${PREFIX}/bin
        @rm -f ${DESTDIR}${PREFIX}/bin/slock

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

 
 .PHONY: all options clean dist install uninstall
 
 .PHONY: all options clean dist install uninstall