From c158e82214c4cabfbb775ca8e07df35f404f80c2 Mon Sep 17 00:00:00 2001 From: Rene Gollent Date: Tue, 21 Jun 2011 18:12:58 +0000 Subject: [PATCH] Remove bash completion from the image for now, since as currently implemented it breaks the build. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42277 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/HaikuImage | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage index 9418deef0c..d5a4bfe151 100644 --- a/build/jam/HaikuImage +++ b/build/jam/HaikuImage @@ -433,7 +433,7 @@ SEARCH on $(spellFiles) 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 += termcap sysless sysless.in ; @@ -444,16 +444,16 @@ profileFiles = $(profileFiles:G=profile-d) ; 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) ;