[llvm-commits] CVS: llvm/Makefile.rules

[Reid Spencer]

Changes in directory llvm:

Makefile.rules updated: 1.260 -> 1.261
---
Log message:

Finish the implementation of the BYTECODE_DESTINATION feature for modules
too and getting rid of the last remnants of bytecode_libdir.


---
Diffs of the changes:  (+11 -5)

Index: llvm/Makefile.rules
diff -u llvm/Makefile.rules:1.260 llvm/Makefile.rules:1.261
--- llvm/Makefile.rules:1.260	Mon Dec 13 01:28:21 2004
+++ llvm/Makefile.rules	Mon Dec 13 01:38:07 2004
@@ -342,8 +342,8 @@
 $(libdir):
 	$(Verb) $(MKDIR) $(libdir)
 
-$(bytecode_libdir):
-	$(Verb) $(MKDIR) $(bytecode_libdir)
+$(includedir):
+	$(Verb) $(MKDIR) $(includedir)
 
 $(sysconfdir):
 	$(Verb) $(MKDIR) $(sysconfdir)
@@ -498,11 +498,18 @@
 	-$(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 @@
 	$(Echo) "libdir         : " '$(libdir)'
 	$(Echo) "bindir         : " '$(bindir)'
 	$(Echo) "sysconfdir     : " '$(sysconfdir)'
-	$(Echo) "bytecode_libdir: " '$(bytecode_libdir)'
 	$(Echo) "UserTargets    : " '$(UserTargets)'
 	$(Echo) "ObjMakefiles   : " '$(ObjMakefiles)'
 	$(Echo) "SrcMakefiles   : " '$(SrcMakefiles)'