made some build fixes

git-svn-id: http://svn.ipfire.org/svn/ipfire/branches/2.1/trunk@1165 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/rootfiles/core/6/files b/config/rootfiles/core/6/files
index a7956cce1c09b95c68f874741973de684c22bf1b..ab8004f365c5e13d766e6d24f8217e314535eba5 100644 (file)
--- a/config/rootfiles/core/6/files
+++ b/config/rootfiles/core/6/files
@@ -10,6 +10,5 @@ lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/usb/net/mcs7830.ko
 lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/ieee1394/sbp2.ko
 /sbin/kudzu
 var/ipfire/langs
-srv/web/html/
 srv/web/ipfire/cgi-bin/outgoingfw.cgi
 etc/init.d/squid

diff --git a/doc/language_issues.de b/doc/language_issues.de
index 30f00820d1114949e0350d6bce0e77e206362d73..503c703210759cd37482b908d172a5960ee412b1 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -214,6 +214,7 @@ WARNING: translation string unused: max size
 WARNING: translation string unused: mbmon fan in
 WARNING: translation string unused: mbmon graphs
 WARNING: translation string unused: mbmon temp in
+WARNING: translation string unused: mbmon value
 WARNING: translation string unused: min size
 WARNING: translation string unused: minutes
 WARNING: translation string unused: missing dat

diff --git a/doc/language_issues.en b/doc/language_issues.en
index 8ba981b483856d12e518e3e028de765cc8185037..f30083055e23e66180993271edcf9a716ee717bb 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -241,6 +241,7 @@ WARNING: translation string unused: max size
 WARNING: translation string unused: mbmon fan in
 WARNING: translation string unused: mbmon graphs
 WARNING: translation string unused: mbmon temp in
+WARNING: translation string unused: mbmon value
 WARNING: translation string unused: min size
 WARNING: translation string unused: minutes
 WARNING: translation string unused: missing dat

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 656d5af7ce41025d943112a3b077ab8108411f7a..037783e4b3a44fe1349a04ddeeacf7416c9c2da0 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -853,7 +853,7 @@
 'inactive' => 'inaktiv',
 'include logfiles' => 'mit Logdateien',
 'incoming' => 'eingehend',
-'incoming traffic in bytes per second' => 'Eingehender Verkehr in Bytes pro Sekunde',
+'incoming traffic in bytes per second' => 'Eingehender Verkehr',
 'incorrect password' => 'Fehlerhaftes Passwort',
 'info' => 'Info',
 'init string' => 'Initialisierung:',
@@ -1200,7 +1200,7 @@
 'out' => 'Aus',
 'outgoing' => 'ausgehend',
 'outgoing firewall' => 'Ausgehende Firewall',
-'outgoing traffic in bytes per second' => 'Abgehender Verkehr in Bytes pro Sekunde',
+'outgoing traffic in bytes per second' => 'Abgehender Verkehr',
 'outgoingfw mode0' => 'In diesem Modus ist es allen Rechnern im Netzwerk uneingeschraenkt moeglich Verbindungen ins Internet aufzubauen.',
 'outgoingfw mode1' => 'In diesem Modus werden nur Verbindungen nach den oben definierten Regeln zugelassen.',
 'outgoingfw mode2' => 'In diesem Modus werden saemtliche Verbindungen erlaubt, bis auf die oben definierten Block-Regeln.',

diff --git a/lfs/Config b/lfs/Config
index 32f92eb0633fc4e751c5391db8e8e14bcd83829c..109eec3693c691d087b9a8c6b9c564089eacd77a 100644 (file)
--- a/lfs/Config
+++ b/lfs/Config
@@ -34,7 +34,7 @@
 # a site you should change its URL to that of a suitable mirror site.
 #
 URL_IPFIRE  = http://source.ipfire.org/othersrc
-URL_TOOLCHAIN = http://source.ipfire.org/toolchain
+URL_TOOLCHAIN = http://source.ipfire.org/toolchains
 
 # Default compiler optimizations.
 #

diff --git a/lfs/collectd b/lfs/collectd
index b6190385c6787aecda27347f7bdd50f09031285f..72c4829c7b965986487d4933f768eac311447b88 100644 (file)
--- a/lfs/collectd
+++ b/lfs/collectd
@@ -77,7 +77,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --localstatedir=/var \
+       cd $(DIR_APP) && ./configure --prefix=/usr --localstatedir=/var \
                --disable-{apache,apple_sensors,csv,ipvs,memcached,mysql,netlink,nginx,nut} \
                --disable-{perl,serial,sensors,snmp,tape,vserver,wireless,xmms} \
                --enable-{apcups,battery,cpu{,freq},df,disk,dns,email,entropy,exec,hddtemp} \