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

diff --git a/Makefile.rules b/Makefile.rules
index 8327399f91b2120b34978ae9b5fd1f94abe6132c..acc4403e0834c4d543d7548dd6a9bdd97b6ef806 100644 (file)
--- a/Makefile.rules
+++ b/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)'