Pakfire laedt die Listen jetzt besser und hat eine veraenderte Oberflaeche bekommen.

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

diff --git a/lfs/apache2 b/lfs/apache2
index d4e176e9fd026f7cbbf85a8c0b6d9df37eb08db0..73baa80ade4ba4c19a0e3e2f80246c021f3efc2e 100644 (file)
--- a/lfs/apache2
+++ b/lfs/apache2
@@ -32,7 +32,7 @@ THISAPP    = httpd-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-ifeq "$(PASS)" "CONFIG"
+ifeq "$(PASS)" "C"
        TARGET     = $(DIR_INFO)/$(THISAPP)-config
 else
        TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -78,7 +78,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-ifeq "$(PASS)" "CONFIG"
+ifeq "$(PASS)" "C"
        # DO THIS IN AN EXTRA STEP BECAUSE PHP AND SUBVERSION WILL FAIL.
 
        cp -rf $(DIR_CONF)/httpd/* /etc/httpd/conf
@@ -86,21 +86,20 @@ ifeq "$(PASS)" "CONFIG"
        -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/
+       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 /home/httpd/cgi-bin/{*,logs.cgi/*,vpn.cgi/*}; do \
+       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 /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}
+       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
@@ -116,15 +115,15 @@ else
        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 "    datadir:            /srv/web/ipfire" >> $(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 "    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:      /home/httpd" >> $(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
@@ -132,7 +131,7 @@ else
 
        cd $(DIR_APP) && ./configure --enable-layout=IPFire \
                                --enable-ssl --enable-mods-shared=all
-       cd $(DIR_APP) && make
+       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}} \