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

* Removed /system/etc directory.

Browse Source 
* /etc now points to /boot/common/etc/, and the remaining contents of the former
  "etc" are put there now, as well.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33986 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2009-11-10 14:26:42 +00:00
parent 3734adc5b3
commit 492dd892ce
7 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/HaikuImage
+4 -4
View File
@@ -381,7 +381,7 @@ local spellFiles = words geekspeak ;
spellFiles = $(spellFiles:G=spell) ;
SEARCH on $(spellFiles)
= [ FDirName $(HAIKU_TOP) src apps mail ] ;
AddFilesToHaikuImage system etc word_dictionary : $(spellFiles) ;
AddFilesToHaikuImage common etc word_dictionary : $(spellFiles) ;
# Locale kit language files
local languageDir = [ FDirName $(HAIKU_TOP) src data locale languages ] ;
@@ -392,14 +392,14 @@ local etcFiles = bash_completion inputrc profile ;
etcFiles = $(etcFiles:G=etc) ;
SEARCH on $(etcFiles) = [ FDirName $(HAIKU_TOP) data etc ] ;
etcFiles += <etc>termcap <etc>sysless <etc>sysless.in ;
AddFilesToHaikuImage system etc : $(etcFiles) ;
AddFilesToHaikuImage common etc : $(etcFiles) ;
SEARCH on <bash_completion>subversion =
[ FDirName $(HAIKU_TOP) data etc bash_completion.d ] ;
AddFilesToHaikuImage system etc bash_completion.d : <bash_completion>subversion ;
AddFilesToHaikuImage common etc bash_completion.d : <bash_completion>subversion ;
SEARCH on <etc>vimrc = [ FDirName $(HAIKU_TOP) data etc vim ] ;
AddFilesToHaikuImage system etc vim : <etc>vimrc ;
AddFilesToHaikuImage common etc vim : <etc>vimrc ;
local dataFiles = teapot.data ;
dataFiles = $(dataFiles:G=data) ;
build/jam/ImageRules
+1 -1
View File
@@ -784,7 +784,7 @@ rule AddEntryToHaikuImageUserGroupFile file : entry
Always $(file) ;
MakeLocate $(file) : $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) ;
BuildHaikuImageUserGroupFile $(file) ;
AddFilesToHaikuImage system etc : $(file) ;
AddFilesToHaikuImage common etc : $(file) ;
}
HAIKU_IMAGE_USER_GROUP_ENTRIES on $(file) = $(allEntries) ;
build/jam/OptionalPackages
+1 -1
View File
@@ -148,7 +148,7 @@ if [ IsOptionalHaikuImagePackageAdded BeOSCompatibility ] {
AddSymlinkToHaikuImage beos : ../system/apps ;
AddSymlinkToHaikuImage beos : ../system/bin ;
AddSymlinkToHaikuImage beos : ../system/documentation ;
AddSymlinkToHaikuImage beos : ../system/etc ;
AddSymlinkToHaikuImage beos : ../common/etc ;
AddSymlinkToHaikuImage beos : ../system/preferences ;
AddSymlinkToHaikuImage beos : ../system ;
}