From: ms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Date: Sun, 20 Jan 2008 20:54:19 +0000 (+0000)
Subject: Removed some more stuff about the langs dir.
X-Git-Tag: v3.0-alpha1~1122
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0c8a2cc0c2b26e64372d0b6e6010c2119b8331bb;p=ipfire-3.x.git

Removed some more stuff about the langs dir.


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

diff --git a/lfs/stage3 b/lfs/stage3
index 1d68b39ca..c8c735433 100644
--- a/lfs/stage3
+++ b/lfs/stage3
@@ -48,7 +48,7 @@ $(TARGET) :
 
 	# Create all directories
 	for i in addon-lang auth backup ca certs connscheduler crls ddns dhcp dhcpc dmzholes \
-	    ethernet extrahd/bin fwlogs isdn key langs logging main mbmon menu.d modem net-traffic \
+	    ethernet extrahd/bin fwlogs isdn key logging main mbmon menu.d modem net-traffic \
 			net-traffic/templates nfs optionsfw outgoing/bin patches pakfire portfw \
 	    ppp private proxy/advanced/cre proxy/calamaris/bin qos/bin red remote snort time tripwire/report \
 			updatexlrator/bin updatexlrator/autocheck urlfilter/autoupdate urlfilter/bin upnp vpn \
@@ -96,7 +96,6 @@ $(TARGET) :
 	cp $(DIR_SRC)/config/cfgroot/time-settings		$(CONFIG_ROOT)/time/settings
 	cp $(DIR_SRC)/config/cfgroot/logging-settings		$(CONFIG_ROOT)/logging/settings
 	cp $(DIR_SRC)/config/cfgroot/useragents			$(CONFIG_ROOT)/proxy/advanced
-	cp $(DIR_SRC)/langs/list					$(CONFIG_ROOT)/langs/
 
 	# Oneliner configfiles
 	echo  "ENABLED=off"		> $(CONFIG_ROOT)/vpn/settings
@@ -118,15 +117,11 @@ $(TARGET) :
 	# Modify CONFIG_ROOT in lang.pl
 	sed -i -e "s+CONFIG_ROOT+$(CONFIG_ROOT)+g" \
 	    $(CONFIG_ROOT)/lang.pl
-
-	# Language files
-	cp $(DIR_SRC)/langs/de/cgi-bin/de.pl $(CONFIG_ROOT)/langs/
-	cp $(DIR_SRC)/langs/en/cgi-bin/en.pl $(CONFIG_ROOT)/langs/
 	
 	# Configroot permissions
 	chown -R nobody:nobody $(CONFIG_ROOT)
 	chown      root:root   $(CONFIG_ROOT)
-	for i in backup/ header.pl general-functions.pl lang.pl addon-lang/ langs/ red/ ; do \
+	for i in backup/ header.pl general-functions.pl lang.pl addon-lang/ red/ ; do \
             chown -R root:root $(CONFIG_ROOT)/$$i; \
 	done
 	chown root:nobody $(CONFIG_ROOT)/dhcpc
diff --git a/tools/make-include b/tools/make-include
index 661c8f7f5..5865c1b17 100644
--- a/tools/make-include
+++ b/tools/make-include
@@ -666,7 +666,7 @@ prepareenv() {
 	mkdir -p $LFS/{$TOOLS_DIR,usr/src} 2>/dev/null
 	mkdir -p $LFS/dev/pts
 	mkdir -p $LFS/proc
-	mkdir -p $LFS/usr/src/{cache,config,doc,html,langs,lfs,log_${MACHINE},src,ccache,distcc}
+	mkdir -p $LFS/usr/src/{cache,config,doc,html,lfs,log_${MACHINE},src,ccache,distcc}
 	mkdir -p $LFS/{$INSTALLER_DIR,cdrom,images,usr/local/{ccache,distcc}}
 	mkdir -p $LFS/etc
 
@@ -682,7 +682,6 @@ prepareenv() {
 	mount --bind $BASEDIR/config															$LFS/usr/src/config
 	mount --bind $BASEDIR/doc																	$LFS/usr/src/doc
 	mount --bind $BASEDIR/html																$LFS/usr/src/html
-	mount --bind $BASEDIR/langs																$LFS/usr/src/langs
 	mount --bind $BASEDIR/lfs																	$LFS/usr/src/lfs
 	mount --bind $BASEDIR/log_${MACHINE}											$LFS/usr/src/log_${MACHINE}
 	mount --bind $BASEDIR/src																	$LFS/usr/src/src