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

[Brian Gaeke]

Changes in directory llvm:

Makefile updated: 1.20 -> 1.21
Makefile.rules updated: 1.177 -> 1.178

---
Log message:

Fix bug in installation process: MKDIR must respect DESTDIR.

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

Index: llvm/Makefile
diff -u llvm/Makefile:1.20 llvm/Makefile:1.21
--- llvm/Makefile:1.20	Sun Feb  8 01:44:30 2004
+++ llvm/Makefile	Mon Feb  9 11:38:51 2004
@@ -32,7 +32,7 @@
 .PHONY: install-includes
 
 install-includes:
-	$(MKDIR) $(includedir)/llvm
+	$(MKDIR) $(DESTDIR)$(includedir)/llvm
 	cd include && find * '!' '(' -name '*~' -o -name .cvsignore ')' -print | grep -v CVS | pax -rwdvpe $(DESTDIR)$(includedir)/llvm
 
 install:: install-includes


Index: llvm/Makefile.rules
diff -u llvm/Makefile.rules:1.177 llvm/Makefile.rules:1.178
--- llvm/Makefile.rules:1.177	Wed Feb  4 15:41:23 2004
+++ llvm/Makefile.rules	Mon Feb  9 11:38:52 2004
@@ -548,7 +548,7 @@
 	@${ECHO} ======= Finished building $(LIBRARYNAME) dynamic debug library =======
 
 install-dynamic-library: $(LIBNAME_CUR)
-	$(MKDIR) $(libdir)
+	$(MKDIR) $(DESTDIR)$(libdir)
 	$(VERB) $(LIBTOOL) --mode=install $(INSTALL) $(LIBNAME_CUR) $(DESTDIR)$(libdir)/lib$(LIBRARYNAME)$(SHLIBEXT)
 
 #
@@ -573,7 +573,7 @@
 	@${ECHO} ======= Finished building $(LIBRARYNAME) archive debug library =======
 
 install-archive-library: $(LIBNAME_ACUR)
-	$(MKDIR) $(libdir)
+	$(MKDIR) $(DESTDIR)$(libdir)
 	$(VERB) $(LIBTOOL) --mode=install $(INSTALL) $(LIBNAME_ACUR) $(DESTDIR)$(libdir)/lib$(LIBRARYNAME).a
 
 #
@@ -603,7 +603,7 @@
 	$(VERB) $(Relink) -o $@ $(RObjectsG) $(LibSubDirs)
 
 install-single-object-library: $(LIBNAME_OBJCUR)
-	$(MKDIR) $(libdir)
+	$(MKDIR) $(DESTDIR)$(libdir)
 	$(VERB) $(LIBTOOL) --mode=install $(INSTALL) $(LIBNAME_OBJCUR) $(DESTDIR)$(libdir)/$(LIBRARYNAME).o
 
 endif
@@ -686,7 +686,7 @@
 	@${ECHO} ======= Finished building $(TOOLNAME) profile executable =======
 
 install:: $(TOOLEXENAMES)
-	$(MKDIR) $(bindir)
+	$(MKDIR) $(DESTDIR)$(bindir)
 	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -c -m 0755 $(TOOLEXENAMES) $(DESTDIR)$(bindir)/$(TOOLNAME)
 
 endif