Finish the implementation of the BYTECODE_DESTINATION feature for modules

too and getting rid of the last remnants of bytecode_libdir.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@18880 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Reid Spencer 2004-12-13 07:38:07 +00:00
parent 8f094f3a8b
commit ab3690bdd1

View File

@ -342,8 +342,8 @@ $(bindir):
$(libdir): $(libdir):
$(Verb) $(MKDIR) $(libdir) $(Verb) $(MKDIR) $(libdir)
$(bytecode_libdir): $(includedir):
$(Verb) $(MKDIR) $(bytecode_libdir) $(Verb) $(MKDIR) $(includedir)
$(sysconfdir): $(sysconfdir):
$(Verb) $(MKDIR) $(sysconfdir) $(Verb) $(MKDIR) $(sysconfdir)
@ -498,11 +498,18 @@ ifneq ($(strip $(Module)),)
-$(Verb) $(RM) -f $(Module) -$(Verb) $(RM) -f $(Module)
endif 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) install-local:: $(DestModule)
$(DestModule): $(bytecode_libdir) $(Module) $(DestModule): $(ModuleDestDir) $(Module)
$(Echo) Installing $(BuildMode) Bytecode Module $(DestModule) $(Echo) Installing $(BuildMode) Bytecode Module $(DestModule)
$(Verb) $(INSTALL) $(Module) $@ $(Verb) $(INSTALL) $(Module) $@
@ -1362,7 +1369,6 @@ printvars::
$(Echo) "libdir : " '$(libdir)' $(Echo) "libdir : " '$(libdir)'
$(Echo) "bindir : " '$(bindir)' $(Echo) "bindir : " '$(bindir)'
$(Echo) "sysconfdir : " '$(sysconfdir)' $(Echo) "sysconfdir : " '$(sysconfdir)'
$(Echo) "bytecode_libdir: " '$(bytecode_libdir)'
$(Echo) "UserTargets : " '$(UserTargets)' $(Echo) "UserTargets : " '$(UserTargets)'
$(Echo) "ObjMakefiles : " '$(ObjMakefiles)' $(Echo) "ObjMakefiles : " '$(ObjMakefiles)'
$(Echo) "SrcMakefiles : " '$(SrcMakefiles)' $(Echo) "SrcMakefiles : " '$(SrcMakefiles)'