[haiku-commits] r42277 - haiku/trunk/build/jam
- From: anevilyak@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 21 Jun 2011 20:12:59 +0200 (CEST)
Author: anevilyak
Date: 2011-06-21 20:12:58 +0200 (Tue, 21 Jun 2011)
New Revision: 42277
Changeset: https://dev.haiku-os.org/changeset/42277
Modified:
haiku/trunk/build/jam/HaikuImage
Log:
Remove bash completion from the image for now, since as currently implemented
it breaks the build.
Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage 2011-06-21 13:06:26 UTC (rev 42276)
+++ haiku/trunk/build/jam/HaikuImage 2011-06-21 18:12:58 UTC (rev 42277)
@@ -433,7 +433,7 @@
AddFilesToHaikuImage system data spell_check word_dictionary : $(spellFiles) ;
local etcDir = [ FDirName $(HAIKU_TOP) data etc ] ;
-local etcFiles = inputrc profile bash_completion ;
+local etcFiles = inputrc profile ;
etcFiles = $(etcFiles:G=etc) ;
SEARCH on $(etcFiles) = [ FDirName $(etcDir) ] ;
etcFiles += <etc>termcap <etc>sysless <etc>sysless.in ;
@@ -444,16 +444,16 @@
AddDirectoryToHaikuImage common etc profile.d ;
AddFilesToHaikuImage common etc profile.d : $(profileFiles) ;
-local bashCompletionFiles = [ Glob $(etcDir)/bash_completion.d : * ] ;
-local bashCompletionHelperFiles
- = [ Glob $(etcDir)/bash_completion.d/helpers : * ] ;
-bashCompletionFiles = $(bashCompletionFiles:G=bash-completion) ;
-bashCompletionHelperFiles = $(bashCompletionHelperFiles:G=bash-completion-hlp)
;
-AddDirectoryToHaikuImage common etc bash_completion.d ;
-AddDirectoryToHaikuImage common etc bash_completion.d helpers ;
-AddFilesToHaikuImage common etc bash_completion.d : $(bashCompletionFiles) ;
-AddFilesToHaikuImage common etc bash_completion.d helpers
- : $(bashCompletionHelperFiles) ;
+#local bashCompletionFiles = [ Glob $(etcDir)/bash_completion.d : * ] ;
+#local bashCompletionHelperFiles
+# = [ Glob $(etcDir)/bash_completion.d/helpers : * ] ;
+#bashCompletionFiles = $(bashCompletionFiles:G=bash-completion) ;
+#bashCompletionHelperFiles =
$(bashCompletionHelperFiles:G=bash-completion-hlp) ;
+#AddDirectoryToHaikuImage common etc bash_completion.d ;
+#AddDirectoryToHaikuImage common etc bash_completion.d helpers ;
+#AddFilesToHaikuImage common etc bash_completion.d : $(bashCompletionFiles) ;
+#AddFilesToHaikuImage common etc bash_completion.d helpers
+# : $(bashCompletionHelperFiles) ;
local dataFiles = teapot.data ;
dataFiles = $(dataFiles:G=data) ;
Other related posts:
- » [haiku-commits] r42277 - haiku/trunk/build/jam - anevilyak
