Merge pull request #7 from frgm/master

fix configure and add a new target - "uninstall"

diff --git a/bsd.prog.mk b/bsd.prog.mk
index 39d35f19d86e382b92019cc2439a2b3cd7962411..50bbcb3010e3808bc4b5f8ba9be975cfc51834f7 100644 (file)
--- a/bsd.prog.mk
+++ b/bsd.prog.mk
@@ -29,6 +29,12 @@ install: ${PROG} ${PAM_DOAS} ${MAN}
        cp -f doas.1 ${DESTDIR}${MANDIR}/man1
        cp -f doas.conf.5 ${DESTDIR}${MANDIR}/man5
 
+uninstall:
+       rm -f ${DESTDIR}${BINDIR}/${PROG}
+       rm -f ${DESTDIR}${PAMDIR}/doas
+       rm -f ${DESTDIR}${MANDIR}/man1/doas.1
+       rm -f ${DESTDIR}${MANDIR}/man5/doas.conf.5
+
 clean:
        rm -f version.h
        rm -f libopenbsd.a
@@ -40,4 +46,4 @@ clean:
 
 -include ${OBJS:.o=.d} ${OPENBSD:.o=.d}
 
-.PHONY: default clean install
+.PHONY: default clean install uninstall

diff --git a/configure b/configure
index 5f896c478aa58a7642a3ca7f2283f09a317c33c4..0e3fd39cf99f3956bd1323032aace2645aba1a12 100755 (executable)
--- a/configure
+++ b/configure
@@ -91,11 +91,11 @@ if [ -z "$OS" ]; then
        KERNEL=${REST%%-*}
 fi
 
-OS_FLAGS="-D__${OS}__"
+OS_CFLAGS="-D__${OS}__"
 
 case "$OS" in
        linux)
-               OS_CFLAGS+=" -D_DEFAULT_SOURCE -D_GNU_SOURCE -DUID_MAX=60000 -DGID_MAX=60000"
+               OS_CFLAGS="$OS_CFLAGS -D_DEFAULT_SOURCE -D_GNU_SOURCE -DUID_MAX=60000 -DGID_MAX=60000"
                printf 'CURDIR   :=     .\n' >>$CONFIG_MK
                printf 'PAM_DOAS  =     pam.d__doas__linux\n' >>$CONFIG_MK
                ;;