[gs-cvs] rev 8115 - in trunk/gs: cups src

[giles at ghostscript.com]

Author: giles
Date: 2007-07-10 16:30:47 -0700 (Tue, 10 Jul 2007)
New Revision: 8115

Modified:
   trunk/gs/cups/cups.mak
   trunk/gs/src/unix-dll.mak
   trunk/gs/src/unixinst.mak
Log:
Complete support for DESTDIR in staged installs with the unix makefiles. 
Bug 689277.


Modified: trunk/gs/cups/cups.mak
===================================================================
--- trunk/gs/cups/cups.mak	2007-07-10 23:00:51 UTC (rev 8114)
+++ trunk/gs/cups/cups.mak	2007-07-10 23:30:47 UTC (rev 8115)
@@ -38,14 +38,14 @@
 install:	install-cups
 
 install-cups:
-	-mkdir -p $(CUPSSERVER)/filter
-	$(INSTALL_PROGRAM) cups/pstoraster $(CUPSSERVER)/filter
-	$(INSTALL_PROGRAM) cups/pstopxl $(CUPSSERVER)/filter
-	-mkdir -p $(CUPSCONFIG)
-	$(INSTALL_DATA) cups/pstoraster.convs $(CUPSCONFIG)
-	-mkdir -p $(CUPSDATA)/model
-	$(INSTALL_DATA) cups/pxlcolor.ppd $(CUPSDATA)/model
-	$(INSTALL_DATA) cups/pxlmono.ppd $(CUPSDATA)/model
+	-mkdir -p $(DESTDIR)$(CUPSSERVER)/filter
+	$(INSTALL_PROGRAM) cups/pstoraster $(DESTDIR)$(CUPSSERVER)/filter
+	$(INSTALL_PROGRAM) cups/pstopxl $(DESTDIR)$(CUPSSERVER)/filter
+	-mkdir -p $(DESTDIR)$(CUPSCONFIG)
+	$(INSTALL_DATA) cups/pstoraster.convs $(DESTDIR)$(CUPSCONFIG)
+	-mkdir -p $(DESTDIR)$(CUPSDATA)/model
+	$(INSTALL_DATA) cups/pxlcolor.ppd $(DESTDIR)$(CUPSDATA)/model
+	$(INSTALL_DATA) cups/pxlmono.ppd $(DESTDIR)$(CUPSDATA)/model
 
 
 #

Modified: trunk/gs/src/unix-dll.mak
===================================================================
--- trunk/gs/src/unix-dll.mak	2007-07-10 23:00:51 UTC (rev 8114)
+++ trunk/gs/src/unix-dll.mak	2007-07-10 23:30:47 UTC (rev 8115)
@@ -108,19 +108,19 @@
 	$(MAKE) $(SODEFS) GENOPT='-DDEBUG' CFLAGS='$(CFLAGS_DEBUG) $(CFLAGS_SO) $(GCFLAGS) $(XCFLAGS)' $(GSSOC) $(GSSOX)
 
 install-so: so
-	-mkdir -p $(prefix)
-	-mkdir -p $(datadir)
-	-mkdir -p $(gsdir)
-	-mkdir -p $(gsdatadir)
-	-mkdir -p $(bindir)
-	-mkdir -p $(libdir)
-	$(INSTALL_PROGRAM) $(GSSOC) $(bindir)/$(GSSOC_XENAME)
-	$(INSTALL_PROGRAM) $(GSSOX) $(bindir)/$(GSSOX_XENAME)
-	$(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME_MAJOR_MINOR)
-	$(RM_) $(libdir)/$(GS_SONAME)
-	ln -s $(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME)
-	$(RM_) $(libdir)/$(GS_SONAME_MAJOR)
-	ln -s $(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME_MAJOR)
+	-mkdir -p $(DESTDIR)$(prefix)
+	-mkdir -p $(DESTDIR)$(datadir)
+	-mkdir -p $(DESTDIR)$(gsdir)
+	-mkdir -p $(DESTDIR)$(gsdatadir)
+	-mkdir -p $(DESTDIR)$(bindir)
+	-mkdir -p $(DESTDIR)$(libdir)
+	$(INSTALL_PROGRAM) $(GSSOC) $(DESTDIR)$(bindir)/$(GSSOC_XENAME)
+	$(INSTALL_PROGRAM) $(GSSOX) $(DESTDIR)$(bindir)/$(GSSOX_XENAME)
+	$(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR_MINOR)
+	$(RM_) $(DESTDIR)$(libdir)/$(GS_SONAME)
+	ln -s $(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME)
+	$(RM_) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR)
+	ln -s $(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR)
 
 soinstall: install-so install-scripts install-data
 

Modified: trunk/gs/src/unixinst.mak
===================================================================
--- trunk/gs/src/unixinst.mak	2007-07-10 23:00:51 UTC (rev 8114)
+++ trunk/gs/src/unixinst.mak	2007-07-10 23:30:47 UTC (rev 8115)
@@ -171,7 +171,7 @@
 	done
 
 install-shared: $(GS_SHARED_OBJS)
-	-mkdir -p $(gssharedir)
+	-mkdir -p $(DESTDIR)$(gssharedir)
 	$(SH) -c 'for obj in $(GS_SHARED_OBJS); do \
-	    $(INSTALL_PROGRAM) $$obj $(gssharedir)/; done'
+	    $(INSTALL_PROGRAM) $$obj $(DESTDIR)$(gssharedir)/; done'