Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 966 invoked from network); 3 Apr 2005 17:41:06 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 3 Apr 2005 17:41:06 -0000 Received: (qmail 63959 invoked by uid 500); 3 Apr 2005 17:41:05 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 63943 invoked by uid 500); 3 Apr 2005 17:41:05 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 63930 invoked by uid 99); 3 Apr 2005 17:41:05 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Sun, 03 Apr 2005 10:41:05 -0700 Received: (qmail 953 invoked by uid 65534); 3 Apr 2005 17:41:04 -0000 Message-ID: <20050403174104.952.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Sun, 03 Apr 2005 17:41:04 -0000 Subject: svn commit: r159939 - in httpd/httpd/branches/simple-conf: Makefile.in configure.in To: cvs@httpd.apache.org From: slive@apache.org X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: slive Date: Sun Apr 3 10:41:03 2005 New Revision: 159939 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D159939 Log: configure.in: perfrom variable substitution on all the files living in extra/ Makefile.in: on "make install", create an original/ directory that will contain pristine copies of all the config files and make adjustments to also install the files in extra/. Some review of this would be nice, since I hate mucking around in the build system.=20 Modified: httpd/httpd/branches/simple-conf/Makefile.in httpd/httpd/branches/simple-conf/configure.in Modified: httpd/httpd/branches/simple-conf/Makefile.in URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/simple-conf/Makefil= e=2Ein?view=3Ddiff&r1=3D159938&r2=3D159939 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- httpd/httpd/branches/simple-conf/Makefile.in (original) +++ httpd/httpd/branches/simple-conf/Makefile.in Sun Apr 3 10:41:03 2005 @@ -32,6 +32,13 @@ if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \ $(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir) ; \ fi ; \ + if [ ! -d $(DESTDIR)$(sysconfdir)/extra ]; then \ + $(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir)/extra ; \ + fi ; \ + if [ ! -d $(DESTDIR)$(sysconfdir)/original ]; then \ + $(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir)/original ; \ + $(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir)/original/extra ; \ + fi ; \ cd $(top_srcdir)/docs/conf; \ for i in mime.types magic; do \ if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \ @@ -40,7 +47,7 @@ done; \ for j in $(top_srcdir)/docs/conf $(top_builddir)/docs/conf ; do \ cd $$j ; \ - for i in *-std*.conf; do \ + for i in httpd.conf extra/httpd-*.conf; do \ ( \ n_lm=3D`awk 'BEGIN {n=3D0} /@@LoadModule@@/ {n+=3D1} END {print n}'= < $$i`; \ if test $$n_lm -eq 0 -o "x$(DSO_MODULES)" =3D "x"; then \ @@ -55,15 +62,9 @@ -e 'p' \ < $$i; \ for j in $(DSO_MODULES) "^EOL^"; do \ - if test "x$$j" =3D "xssl"; then \ - echo ""; \ - fi; \ if test $$j !=3D "^EOL^"; then \ echo "LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \ fi; \ - if test "x$$j" =3D "xssl"; then \ - echo ""; \ - fi; \ done; \ sed -e '1,/@@LoadModule@@/d' \ -e '/@@LoadModule@@/d' \ @@ -71,14 +72,13 @@ -e 's#@@Port@@#$(PORT)#g' \ < $$i; \ fi \ - ) > $(DESTDIR)$(sysconfdir)/$$i; \ - chmod 0644 $(DESTDIR)$(sysconfdir)/$$i; \ - file=3D`echo $$i|sed s/-std//`; \ - if [ "$$file" =3D "httpd.conf" ]; then \ - file=3D`echo $$file|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \ + ) > $(DESTDIR)$(sysconfdir)/original/$$i; \ + chmod 0644 $(DESTDIR)$(sysconfdir)/original/$$i; \ + if [ "$$i" =3D "httpd.conf" ]; then \ + file=3D`echo $$i|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \ fi; \ - if test "$$file" !=3D "$$i" && test ! -f $(DESTDIR)$(sysconfdir)/$$f= ile; then \ - $(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/$$i $(DESTDIR)$(sysconfdir)= /$$file; \ + if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \ + $(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/original/$$i $(DESTDIR)$(sy= sconfdir)/$$i; \ fi; \ done ; \ done ; \ Modified: httpd/httpd/branches/simple-conf/configure.in URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/simple-conf/configu= re.in?view=3Ddiff&r1=3D159938&r2=3D159939 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- httpd/httpd/branches/simple-conf/configure.in (original) +++ httpd/httpd/branches/simple-conf/configure.in Sun Apr 3 10:41:03 2005 @@ -638,7 +638,7 @@ HTTPD_VERSION=3D`$abs_srcdir/build/get-version.sh all $abs_srcdir/include/= ap_release.h AP_SERVER` AC_SUBST(HTTPD_VERSION) =20 -AC_OUTPUT($APACHE_OUTPUT_FILES docs/conf/httpd-std.conf docs/conf/ssl-std.= conf include/ap_config_layout.h support/apxs support/apachectl support/dbmm= anage support/envvars-std support/log_server_status support/logresolve.pl s= upport/phf_abuse_log.cgi support/split-logfile build/rules.mk build/pkg/pkg= info,[true],[ +AC_OUTPUT($APACHE_OUTPUT_FILES docs/conf/httpd.conf docs/conf/extra/httpd-= autoindex.conf docs/conf/extra/httpd-info.conf docs/conf/extra/httpd-langua= ges.conf docs/conf/extra/httpd-mpm.conf docs/conf/extra/httpd-multilang-err= ordoc.conf docs/conf/extra/httpd-ssl.conf docs/conf/extra/httpd-userdir.con= f docs/conf/extra/httpd-vhosts.conf include/ap_config_layout.h support/apxs= support/apachectl support/dbmmanage support/envvars-std support/log_server= _status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfi= le build/rules.mk build/pkg/pkginfo,[true],[ APACHE_GEN_MAKEFILES ]) =20