Zwischencommit fuer LFS.

[people/pmueller/ipfire-2.x.git] / lfs / apache2

diff --git a/lfs/apache2 b/lfs/apache2
index cb9471e3dac28582914cd990e07405c9be2abfb2..95817344bfd11cd2ae43a02ae1c24c97f90cecec 100644 (file)
--- 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,61 @@ $(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 /home/httpd/{cgi-bin,html}
+       cp -aR $(DIR_SRC)/html/* /home/httpd
+       -find /home/httpd -name .svn -exec rm -rf {} \;
+       cp $(DIR_DL)/sflogo.png /home/httpd/html/images/
+
+       # Change CONFIG_ROOT in cgi-scripts
+       for i in /home/httpd/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 /home/httpd
+       chmod -R 755 /home/httpd/cgi-bin
+       chmod -R 644 /home/httpd/html
+       chmod 755 /home/httpd/html /home/httpd/html/{index.cgi,redirect.cgi,dial.cgi,images,include}
+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:            /home/httpd" >> $(DIR_APP)/config.layout
+       echo "    installbuilddir:    /usr/lib/apache/build" >> $(DIR_APP)/config.layout
+       echo "    errordir:           /home/httpd/error" >> $(DIR_APP)/config.layout
+       echo "    iconsdir:           /home/httpd/icons" >> $(DIR_APP)/config.layout
+       echo "    htdocsdir:          /home/httpd/htdocs" >> $(DIR_APP)/config.layout
+       echo "    manualdir:          /home/httpd/manual" >> $(DIR_APP)/config.layout
+       echo "    cgidir:             /home/httpd/cgi-bin" >> $(DIR_APP)/config.layout
+       echo "    includedir:         /usr/include/apache" >> $(DIR_APP)/config.layout
+       echo "    localstatedir:      /home/httpd" >> $(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 +140,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)