Merge commit 'origin/master' into next

Conflicts:
	src/paks/linux-pae/uninstall.sh

diff --git a/config/rootfiles/common/cmake b/config/rootfiles/common/cmake
index a9a5865b2866299a8cba53bdd247180ff2624566..8cefc88d889454a36bc78ed2a33030427b586b5f 100644 (file)
--- a/config/rootfiles/common/cmake
+++ b/config/rootfiles/common/cmake
@@ -11,6 +11,8 @@
 #usr/local/doc/cmake-2.4/cmake.txt
 #usr/local/doc/cmake-2.4/ctest.html
 #usr/local/doc/cmake-2.4/ctest.txt
+#usr/local/man
+#usr/local/man/man1
 #usr/local/man/man1/ccmake.1
 #usr/local/man/man1/cmake.1
 #usr/local/man/man1/ctest.1

diff --git a/lfs/squidguard b/lfs/squidguard
index a5dd7b9cbfdbd1a7d165f4a5719ab11b310efa28..c70a0d881e67dfce1f269cffb45e27216438b85f 100644 (file)
--- a/lfs/squidguard
+++ b/lfs/squidguard
@@ -75,7 +75,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --with-sg-config=/var/ipfire/urlfilter/squidGuard.conf \
                --with-sg-logdir=/var/log/squidGuard --with-sg-dbhome=/var/lib/squidguard \
                --with-db=/usr --with-db-inc=/usr/include --with-db-lib=/usr/lib
-       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make
        cd $(DIR_APP) && make install
 
        # URL-Filter