diff options
| author | Reid Spencer <rspencer@reidspencer.com> | 2004-12-13 07:38:07 +0000 |
|---|---|---|
| committer | Reid Spencer <rspencer@reidspencer.com> | 2004-12-13 07:38:07 +0000 |
| commit | efe3a8281367cb4da6e82688e66ecf5b53bbaf15 (patch) | |
| tree | 0c47c0338a409ad6e163879ad26f7964f8a42e70 | |
| parent | 65086be55f589be3d93fd86860434f87bbf64f9b (diff) | |
| download | bcm5719-llvm-efe3a8281367cb4da6e82688e66ecf5b53bbaf15.tar.gz bcm5719-llvm-efe3a8281367cb4da6e82688e66ecf5b53bbaf15.zip | |
Finish the implementation of the BYTECODE_DESTINATION feature for modules
too and getting rid of the last remnants of bytecode_libdir.
llvm-svn: 18880
| -rw-r--r-- | llvm/Makefile.rules | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/llvm/Makefile.rules b/llvm/Makefile.rules index 8327399f91b..acc4403e083 100644 --- a/llvm/Makefile.rules +++ b/llvm/Makefile.rules @@ -342,8 +342,8 @@ $(bindir): $(libdir): $(Verb) $(MKDIR) $(libdir) -$(bytecode_libdir): - $(Verb) $(MKDIR) $(bytecode_libdir) +$(includedir): + $(Verb) $(MKDIR) $(includedir) $(sysconfdir): $(Verb) $(MKDIR) $(sysconfdir) @@ -498,11 +498,18 @@ ifneq ($(strip $(Module)),) -$(Verb) $(RM) -f $(Module) endif -DestModule := $(bytecode_libdir)/$(MODULE_NAME).bc +ifdef BYTECODE_DESTINATION +ModuleDestDir := $(BYTECODE_DESTINATION) +else +ModuleDestDir := $(BYTECODE_DESTINATION) +endif + +DestModule := $(ModuleDestDir)/$(MODULE_NAME).bc +install-module:: $(DestModule) install-local:: $(DestModule) -$(DestModule): $(bytecode_libdir) $(Module) +$(DestModule): $(ModuleDestDir) $(Module) $(Echo) Installing $(BuildMode) Bytecode Module $(DestModule) $(Verb) $(INSTALL) $(Module) $@ @@ -1362,7 +1369,6 @@ printvars:: $(Echo) "libdir : " '$(libdir)' $(Echo) "bindir : " '$(bindir)' $(Echo) "sysconfdir : " '$(sysconfdir)' - $(Echo) "bytecode_libdir: " '$(bytecode_libdir)' $(Echo) "UserTargets : " '$(UserTargets)' $(Echo) "ObjMakefiles : " '$(ObjMakefiles)' $(Echo) "SrcMakefiles : " '$(SrcMakefiles)' |
