~armaan/opendoas

c05b37be802b4cc77dff49b9effdc6a768a0be48 — Duncan Overbruck 5 years ago 1200408 + 0f13894 v0.1
Merge pull request #7 from frgm/master

fix configure and add a new target - "uninstall"
2 files changed, 9 insertions(+), 3 deletions(-)

M bsd.prog.mk
M configure
M bsd.prog.mk => bsd.prog.mk +7 -1
@@ 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

M configure => configure +2 -2
@@ 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
		;;