Merge branch 'master' of ssh://git.haiku-os.org/haiku

2011-12-02 17:00:49 +00:00
parent f8631ec46e 44dffa86c0
commit 9bcf0b2e39
117 changed files with 3034 additions and 5 deletions
@@ -455,9 +455,6 @@ profileFiles = $(profileFiles:G=profile-d) ;
 AddDirectoryToHaikuImage common etc profile.d ;
 AddFilesToHaikuImage common etc profile.d : $(profileFiles) ;

-# TODO: Temporary workaround until package management fully moves the /etc dir
-AddSymlinkToHaikuImage common settings : /boot/common/etc ;
-
 #local bashCompletionFiles = [ Glob $(etcDir)/bash_completion.d : * ] ;
 #local bashCompletionHelperFiles
 #    = [ Glob $(etcDir)/bash_completion.d/helpers : * ] ;