webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-22 00:42:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'origin/master' into next

Browse Source 
Conflicts:
	src/paks/linux-pae/uninstall.sh
This commit is contained in:
Arne Fitzenreiter
2010-10-23 13:34:53 +02:00
parent a398cc21e9 889a288b36
commit 8caf7b64c8
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/rootfiles/common/cmake
View File

@@ -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

2
lfs/squidguard
View File

@@ -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