aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuncan Overbruck <administrator@duncano.de>2016-05-09 21:12:31 +0200
committerDuncan Overbruck <administrator@duncano.de>2016-05-09 21:12:31 +0200
commitc05b37be802b4cc77dff49b9effdc6a768a0be48 (patch)
treea5178d8d32fed4ce47360033038cbb68d440e106
parent1200408d46bfd352b568cbb7c6c9cbf7e8584de3 (diff)
parent0f13894a2f9b5fa258d40a3575aaf5dcdf41256b (diff)
downloadopendoas-c05b37be802b4cc77dff49b9effdc6a768a0be48.tar.gz
Merge pull request #7 from frgm/master
fix configure and add a new target - "uninstall"
-rw-r--r--bsd.prog.mk8
-rwxr-xr-xconfigure4
2 files changed, 9 insertions, 3 deletions
diff --git a/bsd.prog.mk b/bsd.prog.mk
index 39d35f1..50bbcb3 100644
--- 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 5f896c4..0e3fd39 100755
--- 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
;;