X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fapache2;h=73baa80ade4ba4c19a0e3e2f80246c021f3efc2e;hb=9fa83d33e6e35c4f8113468f5fa1c2388669cf1d;hp=cb9471e3dac28582914cd990e07405c9be2abfb2;hpb=1658f920584b6f1072b0a2c1c4f1b9e9db7b756b;p=ipfire-2.x.git

diff --git a/lfs/apache2 b/lfs/apache2
index cb9471e3da..73baa80ade 100644
--- a/lfs/apache2
+++ b/lfs/apache2
@@ -32,9 +32,11 @@ THISAPP    = httpd-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = apache2
-PAK_VER    = 1
+ifeq "$(PASS)" "C"
+	TARGET     = $(DIR_INFO)/$(THISAPP)-config
+else
+	TARGET     = $(DIR_INFO)/$(THISAPP)
+endif
 
 ###############################################################################
 # Top-level Rules
@@ -57,9 +59,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
-dist: 
-	@$(PAK)
-
 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################
@@ -79,16 +78,60 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
+ifeq "$(PASS)" "C"
+	# DO THIS IN AN EXTRA STEP BECAUSE PHP AND SUBVERSION WILL FAIL.
+
+	cp -rf $(DIR_CONF)/httpd/* /etc/httpd/conf
+	ln -sf $(CONFIG_ROOT)/main/hostname.conf /etc/httpd/conf/
+	-find /etc/httpd/conf -name .svn -exec rm -rf {} \;
+
+	# Copy all html/cgi-bin files
+	mkdir -p /srv/web/ipfire/{cgi-bin,html/updatecache/{download,metadata}}
+	cp -aR $(DIR_SRC)/html/* /srv/web/ipfire
+	-find /srv/web/ipfire -name .svn -exec rm -rf {} \;
+
+	# Change CONFIG_ROOT in cgi-scripts
+	for i in /srv/web/ipfire/cgi-bin/{*,logs.cgi/*,vpn.cgi/*}; do \
+	    if [ -f $$i ]; then \
+	        sed -i "s+CONFIG_ROOT+$(CONFIG_ROOT)+g" $$i; \
+	    fi; \
+	done
+	chown -R root:root /srv/web/ipfire
+	chmod -R 755 /srv/web/ipfire/cgi-bin
+	chmod -R 644 /srv/web/ipfire/html
+	chmod 755 /srv/web/ipfire/html /srv/web/ipfire/html/{index.cgi,redirect.cgi,dial.cgi,images,include,themes,themes/*,themes/*/*}
+else
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_DL)/httpd-2.2.2-config-1.patch
-	cd $(DIR_APP) && ./configure --enable-layout=FHS \
-				--prefix=/home/httpd --exec-prefix=/usr \
-				--sysconfdir=/etc/httpd/conf \
-				--includedir=/usr/include/apache --mandir=/usr/share/man \
-				--localstatedir=/var \
-				--enable-rewrite --enable-ssl \
-				--enable-mods-shared=all
-	cd $(DIR_APP) && make
+
+	### Add IPFire's layout, too
+	echo "# IPFire layout" >> $(DIR_APP)/config.layout
+	echo "<Layout IPFire>" >> $(DIR_APP)/config.layout
+	echo "    prefix:             /usr" >> $(DIR_APP)/config.layout
+	echo "    exec_prefix:        /usr" >> $(DIR_APP)/config.layout
+	echo "    bindir:             /usr/bin" >> $(DIR_APP)/config.layout
+	echo "    sbindir:            /usr/sbin" >> $(DIR_APP)/config.layout
+	echo "    libdir:             /usr/lib" >> $(DIR_APP)/config.layout
+	echo "    libexecdir:         /usr/lib/apache" >> $(DIR_APP)/config.layout
+	echo "    mandir:             /usr/share/man" >> $(DIR_APP)/config.layout
+	echo "    sysconfdir:         /etc/httpd/conf" >> $(DIR_APP)/config.layout
+	echo "    datadir:            /srv/web/ipfire" >> $(DIR_APP)/config.layout
+	echo "    installbuilddir:    /usr/lib/apache/build" >> $(DIR_APP)/config.layout
+	echo "    errordir:           /srv/web/ipfire/error" >> $(DIR_APP)/config.layout
+	echo "    iconsdir:           /srv/web/ipfire/icons" >> $(DIR_APP)/config.layout
+	echo "    htdocsdir:          /srv/web/ipfire/htdocs" >> $(DIR_APP)/config.layout
+	echo "    manualdir:          /srv/web/ipfire/manual" >> $(DIR_APP)/config.layout
+	echo "    cgidir:             /srv/web/ipfire/cgi-bin" >> $(DIR_APP)/config.layout
+	echo "    includedir:         /usr/include/apache" >> $(DIR_APP)/config.layout
+	echo "    localstatedir:      /srv/web/ipfire" >> $(DIR_APP)/config.layout
+	echo "    runtimedir:         /var/run" >> $(DIR_APP)/config.layout
+	echo "    logfiledir:         /var/log/httpd" >> $(DIR_APP)/config.layout
+	echo "    proxycachedir:      /var/cache/apache/proxy" >> $(DIR_APP)/config.layout
+	echo "</Layout>" >> $(DIR_APP)/config.layout
+
+	cd $(DIR_APP) && ./configure --enable-layout=IPFire \
+				--enable-ssl --enable-mods-shared=all
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	chown -v root:root /usr/lib/apache/httpd.exp \
 	    /usr/sbin/{apxs,apachectl,dbmmanage,envvars{,-std}} \
@@ -96,4 +139,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	    /usr/share/man/man8/{ab,apachectl,apxs,htcacheclean,httpd}.8 \
 	    /usr/share/man/man8/{logresolve,rotatelogs,suexec}.8
 	@rm -rf $(DIR_APP)
+endif
 	@$(POSTBUILD)