Commit 9e768d4d authored by Joshua Slive's avatar Joshua Slive
Browse files

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. 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/simple-conf@159939 13f79535-47bb-0310-9956-ffa450edef68
parent 7a94ff23

Makefile.in

+14 −14
Original line number Diff line number Diff line
@@ -32,6 +32,13 @@ install-conf: 
	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 @@ install-conf: 
	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=`awk 'BEGIN {n=0} /@@LoadModule@@/ {n+=1} END {print n}' < $$i`; \

	    		if test $$n_lm -eq 0 -o "x$(DSO_MODULES)" = "x"; then \
@@ -55,15 +62,9 @@ install-conf: 
	    				-e 'p' \

	    				< $$i; \

	    			for j in $(DSO_MODULES) "^EOL^"; do \

	    				if test "x$$j" = "xssl"; then \

	    					echo "<IfDefine SSL>"; \

	    				fi; \

	    				if test $$j != "^EOL^"; then \

	    					echo "LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \

	    				fi; \

	    				if test "x$$j" = "xssl"; then \

	    					echo "</IfDefine>"; \

	    				fi; \

	    			done; \

	    			sed -e '1,/@@LoadModule@@/d' \

	    				-e '/@@LoadModule@@/d' \
@@ -71,14 +72,13 @@ install-conf: 
	    				-e 's#@@Port@@#$(PORT)#g' \

	    				< $$i; \

	    		fi \

	    	) > $(DESTDIR)$(sysconfdir)/$$i; \

	    	chmod 0644 $(DESTDIR)$(sysconfdir)/$$i; \

	    	file=`echo $$i|sed s/-std//`; \

	    	if [ "$$file" = "httpd.conf" ]; then \

	    		file=`echo $$file|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \

	    	) > $(DESTDIR)$(sysconfdir)/original/$$i; \

	    	chmod 0644 $(DESTDIR)$(sysconfdir)/original/$$i; \

	    	if [ "$$i" = "httpd.conf" ]; then \

	    		file=`echo $$i|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \

	    	fi; \

	    	if test "$$file" != "$$i" && test ! -f $(DESTDIR)$(sysconfdir)/$$file; then \

	    		$(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/$$i $(DESTDIR)$(sysconfdir)/$$file; \

	    	if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \

	    		$(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/original/$$i $(DESTDIR)$(sysconfdir)/$$i; \

	    	fi; \

	    done ; \

	done ; \

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -638,7 +638,7 @@ dnl Ensure that the httpd version is included 
HTTPD_VERSION=`$abs_srcdir/build/get-version.sh all $abs_srcdir/include/ap_release.h AP_SERVER`

AC_SUBST(HTTPD_VERSION)



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/dbmmanage support/envvars-std support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile build/rules.mk build/pkg/pkginfo,[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-languages.conf docs/conf/extra/httpd-mpm.conf docs/conf/extra/httpd-multilang-errordoc.conf docs/conf/extra/httpd-ssl.conf docs/conf/extra/httpd-userdir.conf 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-logfile build/rules.mk build/pkg/pkginfo,[true],[

  APACHE_GEN_MAKEFILES

])