i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* The common directory no longer contains a "config" directory; this fixes

Browse Source 
putting the network "services" config file at the wrong place.
* Removed some dead code.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24118 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2008-02-25 16:57:47 +00:00
parent 4919a4dc6f
commit ff13a96fe4
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/HaikuImage
+1 -7
View File
@@ -324,12 +324,6 @@ AddFilesToHaikuImage beos etc KanBe dic canna : $(kanbeDicCanna) ;
AddDirectoryToHaikuImage beos etc KanBe dic group ; AddDirectoryToHaikuImage beos etc KanBe dic group ;
AddDirectoryToHaikuImage beos etc KanBe dic user ; AddDirectoryToHaikuImage beos etc KanBe dic user ;
#local libnetFiles = networks protocols resolv.conf services ;
#libnetFiles = $(libnetFiles:G=libnet-files) ;
#SEARCH on $(libnetFiles)
# = [ FDirName $(HAIKU_TOP) src kits network compat libnet ] ;
#AddFilesToHaikuImage beos etc : $(libnetFiles) ;
local keymapFiles = [ GLOB [ FDirName $(HAIKU_TOP) src data etc keymaps ] local keymapFiles = [ GLOB [ FDirName $(HAIKU_TOP) src data etc keymaps ]
: *.keymap ] ; : *.keymap ] ;
keymapFiles = $(keymapFiles:BG=keymap) ; keymapFiles = $(keymapFiles:BG=keymap) ;
@@ -353,7 +347,7 @@ AddFilesToHaikuImage home config settings kernel drivers
local networkSettingsFiles = <network-settings>services ; local networkSettingsFiles = <network-settings>services ;
SEARCH on $(networkSettingsFiles) SEARCH on $(networkSettingsFiles)
= [ FDirName $(HAIKU_TOP) data settings network ] ; = [ FDirName $(HAIKU_TOP) data settings network ] ;
AddFilesToHaikuImage common config settings network : $(networkSettingsFiles) ; AddFilesToHaikuImage common settings network : $(networkSettingsFiles) ;
AddSymlinkToHaikuImage home config settings AddSymlinkToHaikuImage home config settings
: /boot/beos/etc/timezones/Europe/Paris : timezone ; : /boot/beos/etc/timezones/Europe/Paris : timezone ;