RRDTool Fix

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

diff --git a/lfs/apache b/lfs/apache
index a4a40ba16d1d6d9245ba8392760501077709fda0..ec5b0dda481dca81752cee0777b223d42621da15 100644 (file)
--- a/lfs/apache
+++ b/lfs/apache
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: apache,v 1.7.2.11 2005/10/20 21:06:50 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -36,7 +30,7 @@ VER        = 1.3.34
 
 THISAPP    = apache_$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = http://www.apache.org/dist/httpd
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -120,7 +114,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
        # Copy all html/cgi-bin files
        cp -aR $(DIR_SRC)/html/* /home/httpd
-       -find /home/httpd -name CVS -exec rm -rf {} \;
+       -find /home/httpd -name .svn -exec rm -rf {} \;
        cp $(DIR_DL)/sflogo.png /home/httpd/html/images/
 
        # Change CONFIG_ROOT in cgi-scripts
@@ -132,7 +126,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        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,images,include}
+       chmod 755 /home/httpd/html /home/httpd/html/{index.cgi,redirect.cgi,dial.cgi,images,include}
 
 
        # backup directory needs nobody:nobody permissions