diff options
| author | Bob Beck <beck@cvs.openbsd.org> | 1998-10-10 18:33:47 +0000 |
|---|---|---|
| committer | Bob Beck <beck@cvs.openbsd.org> | 1998-10-10 18:33:47 +0000 |
| commit | 51d9027b8aa87951d6dc5baf3e72c815cbb8ef9f (patch) | |
| tree | 04aa22f8e427147995647e456077aad757a97d08 /usr.sbin/httpd | |
| parent | a149e24ef4fe7e2bc784925aae931899c696a94a (diff) | |
Apache Configure script can bomb if Configuration.tmpl newer than
Configuration. Modify makefile not to care and disable offending test
in Configure.
Diffstat (limited to 'usr.sbin/httpd')
| -rw-r--r-- | usr.sbin/httpd/src/Configure | 18 | ||||
| -rw-r--r-- | usr.sbin/httpd/src/Makefile.bsd-wrapper | 8 |
2 files changed, 13 insertions, 13 deletions
diff --git a/usr.sbin/httpd/src/Configure b/usr.sbin/httpd/src/Configure index eafb1828701..a8822c7dcfe 100644 --- a/usr.sbin/httpd/src/Configure +++ b/usr.sbin/httpd/src/Configure @@ -129,15 +129,15 @@ fi ## Now see if Configuration.tmpl is more recent than $file. If ## so, then we complain and bail out ## -if ls -lt Configuration.tmpl $file | head -1 | \ - grep 'Configuration.tmpl' > /dev/null -then - echo "Configuration.tmpl is more recent than $file;" - echo "Make sure that $file is valid and, if it is, simply" - echo "'touch $file' and re-run $0 again." - exitcode=1 - exit 1 -fi +#if ls -lt Configuration.tmpl $file | head -1 | \ +# grep 'Configuration.tmpl' > /dev/null +#then +# echo "Configuration.tmpl is more recent than $file;" +# echo "Make sure that $file is valid and, if it is, simply" +# echo "'touch $file' and re-run $0 again." +# exitcode=1 +# exit 1 +#fi echo "Using config file: $file" diff --git a/usr.sbin/httpd/src/Makefile.bsd-wrapper b/usr.sbin/httpd/src/Makefile.bsd-wrapper index 17472848402..9f02e26249c 100644 --- a/usr.sbin/httpd/src/Makefile.bsd-wrapper +++ b/usr.sbin/httpd/src/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.7 1998/10/06 06:39:13 deraadt Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.8 1998/10/10 18:33:45 beck Exp $ .include <bsd.own.mk> PROG=httpd BINDIR=/usr/sbin @@ -12,13 +12,13 @@ all: Makefile .FORCE: .IGNORE helpers/GuessOS: - /usr/bin/lndir -e Makefile.bsd-wrapper -e obj ${.CURDIR} ${.OBJDIR}; touch ${.OBJDIR}/Configuration + /usr/bin/lndir -s -e Makefile.bsd-wrapper -e obj -e obj.${MACHINE_ARCH} -e Configuration ${.CURDIR} ${.OBJDIR}; cp ${.CURDIR}/Configuration ${.OBJDIR}/Configuration config: .FORCE - sh ${.CURDIR}/Configure -file ${.CURDIR}/Configuration -make ${.CURDIR}/Makefile.tmpl + sh ${.CURDIR}/Configure -file ${.OBJDIR}/Configuration -make ${.CURDIR}/Makefile.tmpl Makefile: helpers/GuessOS - sh ${.CURDIR}/Configure -file ${.CURDIR}/Configuration -make ${.CURDIR}/Makefile.tmpl + sh ${.CURDIR}/Configure -file ${.OBJDIR}/Configuration -make ${.CURDIR}/Makefile.tmpl install: ${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ${PROG} ${DESTDIR}${BINDIR} |