X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fapache2;h=95817344bfd11cd2ae43a02ae1c24c97f90cecec;hp=d4e176e9fd026f7cbbf85a8c0b6d9df37eb08db0;hb=c8ead4a543859582497e107173c650cec4203d4f;hpb=411afd1f4b028dc0b6434a737dc62104577ce442 diff --git a/lfs/apache2 b/lfs/apache2 index d4e176e9fd..95817344bf 100644 --- 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 @@ -132,7 +132,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}} \