From dee05112a63cdd440dfb27db12ef541b7afd0a6d Mon Sep 17 00:00:00 2001 From: Reid Spencer Date: Thu, 1 Jun 2006 01:52:49 +0000 Subject: [PATCH] Build llvm-config into the ToolDir not in the local directory. This makes it more likely to be in a developer's path and consistent with all the other tools. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@28613 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/llvm-config/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/llvm-config/Makefile b/tools/llvm-config/Makefile index f4e431578ea..7fd7a3c9794 100644 --- a/tools/llvm-config/Makefile +++ b/tools/llvm-config/Makefile @@ -49,7 +49,7 @@ llvm-config.in: $(ConfigInIn) $(ConfigStatusScript) $(ConfigStatusScript) tools/llvm-config/llvm-config.in # Build our final script. -llvm-config: llvm-config.in $(FinalLibDeps) +$(ToolDir)/llvm-config: llvm-config.in $(FinalLibDeps) $(Echo) "Building llvm-config script." $(Verb) $(ECHO) 's,@LLVM_CXXFLAGS@,$(SUB_CXXFLAGS),' > temp.sed $(Verb) $(ECHO) 's,@LLVM_LDFLAGS@,$(SUB_LDFLAGS),' >> temp.sed @@ -61,19 +61,19 @@ llvm-config: llvm-config.in $(FinalLibDeps) else # We don't have perl, just generate a dummy llvm-config -llvm-config: +$(ToolDir)/llvm-config: $(Echo) "Building place holder llvm-config script." $(Verb) $(ECHO) 'echo llvm-config: Perl not found so llvm-config could not be generated' >> $@ $(Verb) chmod +x $@ endif # Hook into the standard Makefile rules. -all-local:: llvm-config +all-local:: $(ToolDir)/llvm-config clean-local:: - $(Verb) $(RM) -f llvm-config llvm-config.in $(FinalLibDeps) $(LibDeps) \ - GenLibDeps.out + $(Verb) $(RM) -f $(ToolDir)/llvm-config llvm-config.in $(FinalLibDeps) \ + $(LibDeps) GenLibDeps.out install-local:: all-local $(Echo) Installing llvm-config $(Verb) $(MKDIR) $(PROJ_bindir) - $(Verb) $(ScriptInstall) llvm-config $(PROJ_bindir) + $(Verb) $(ScriptInstall) $(ToolDir)/llvm-config $(PROJ_bindir)