=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/sudo/Attic/Makefile.bsd-wrapper,v retrieving revision 1.9 retrieving revision 1.9.4.1 diff -u -r1.9 -r1.9.4.1 --- src/usr.bin/sudo/Attic/Makefile.bsd-wrapper 2000/09/03 18:41:19 1.9 +++ src/usr.bin/sudo/Attic/Makefile.bsd-wrapper 2002/01/18 17:20:22 1.9.4.1 @@ -1,6 +1,7 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.9 2000/09/03 18:41:19 espie Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.9.4.1 2002/01/18 17:20:22 millert Exp $ MAN= sudo.8 sudoers.5 visudo.8 +BINOWN= root XCFLAGS= CC="${CC}" CFLAGS="${CFLAGS} ${COPTS}" LDFLAGS="${LDFLAGS}" CONFIGURE_OPTS= --prefix=/usr --with-devel --with-insults --with-logincap \ --with-env-editor --disable-path-info --with-logfac=authpriv @@ -36,16 +37,12 @@ .endif PATH="/bin:/usr/bin:/sbin:/usr/sbin" \ CONFIG_FILES="Makefile config.h pathnames.h" \ - ${XCFLAGS} \ - INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP}" \ - sh ${.CURDIR}/configure ${CONFIGURE_OPTS} ${CF} + ${XCFLAGS} sh ${.CURDIR}/configure ${CONFIGURE_OPTS} ${CF} config.status: PATH="/bin:/usr/bin:/sbin:/usr/sbin" \ CONFIG_FILES="Makefile config.h pathnames.h" \ - ${XCFLAGS} \ - INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP}" \ - sh ${.CURDIR}/configure ${CONFIGURE_OPTS} ${CF} + ${XCFLAGS} sh ${.CURDIR}/configure ${CONFIGURE_OPTS} ${CF} .ifdef NOMAN maninstall: @@ -53,12 +50,14 @@ .endif install: maninstall - ${MAKE} ${XCFLAGS} prefix=${DESTDIR}/usr sysconfdir=${DESTDIR}/etc \ - bindir=${DESTDIR}/usr/bin INSTALL="${INSTALL} ${INSTALL_COPY}" \ - install-binaries + ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 4555 \ + sudo ${DESTDIR}/usr/bin/sudo + ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + visudo ${DESTDIR}/usr/sbin/visudo clean cleandir: - @test ! -e Makefile || ${MAKE} distclean + @test ! -e Makefile || ${MAKE} distclean + rm -f def_data.c def_data.h depend: # Nothing here so far...