Move bytecode_libdir def'n to Makefile.config.in from Makefile.rules, so it

lives near the other installation dirs (like libdir, bindir, etc.).

Move the rule for making bytecode_libdir out of the ifdef LIBRARYNAME...endif.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@10964 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/Makefile.config.in b/Makefile.config.in
index 8918e8339eb582b5740c5521cc674d5a79fc1148..81e2b63108a599613aa94e26d8073af596fa4e13 100644 (file)
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -187,6 +187,7 @@ sysconfdir = @sysconfdir@
 sharedstatedir = @sharedstatedir@ 
 localstatedir = @localstatedir@
 libdir = @libdir@
+bytecode_libdir = $(LLVMGCCDIR)/bytecode-libs
 includedir = @includedir@
 infodir = @infodir@
 mandir = @mandir@

diff --git a/Makefile.rules b/Makefile.rules
index 7da6f5737ae67f71fca51a9b7038796efda8db76..bae0e9c001373146f55d49180ae58f11e5da90c8 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -454,6 +454,11 @@ endif
 #  of it.  For this reason, sometimes it's useful to use libraries as .a files.
 ###########################################################################
 
+# Install rule for making bytecode library directory if it does not exist.
+# Trigger this by making libraries that need to be installed here depend on it.
+$(DESTDIR)$(bytecode_libdir):
+       $(MKDIR) $@
+
 ifdef LIBRARYNAME
 
 # Make sure there isn't any extranous whitespace on the LIBRARYNAME option
@@ -482,12 +487,8 @@ LIBNAME_BC   := $(DESTLIBBYTECODE)/lib$(LIBRARYNAME).bc
 # dynamic target builds a shared object version of the library...
 dynamic:: $(LIBNAME_CUR)
 bytecodelib:: $(LIBNAME_BC)
-bytecode_libdir = $(LLVMGCCDIR)/bytecode-libs
 install-bytecode-library:: $(DESTDIR)$(bytecode_libdir)/lib$(LIBRARYNAME).bc
 
-$(DESTDIR)$(bytecode_libdir):
-       $(MKDIR) $@
-
 $(DESTDIR)$(bytecode_libdir)/lib$(LIBRARYNAME).bc: $(LIBNAME_BC) $(DESTDIR)$(bytecode_libdir)
        @${ECHO} ======= Installing $(LIBRARYNAME) bytecode library =======
        cp $< $@