[gs-cvs] rev 8077 - in trunk/gs: contrib cups

[till at ghostscript.com]

Author: till
Date: 2007-06-26 08:58:26 -0700 (Tue, 26 Jun 2007)
New Revision: 8077

Modified:
   trunk/gs/contrib/contrib.mak
   trunk/gs/cups/cups.mak
Log:
Replaced the $(install_prefix) from ESP Ghostscript by $(DESTDIR).


Modified: trunk/gs/contrib/contrib.mak
===================================================================
--- trunk/gs/contrib/contrib.mak	2007-06-26 07:08:17 UTC (rev 8076)
+++ trunk/gs/contrib/contrib.mak	2007-06-26 15:58:26 UTC (rev 8077)
@@ -849,10 +849,10 @@
 # and the PPD files are not copied.
 pcl3-install:
 	for f in gs-pcl3 pcl3opts; do	\
-	  $(INSTALL_DATA) $(pcl3_root)doc$(D)$$f.1 $(install_prefix)$(man1dir)/$$f.$(man1ext) \
+	  $(INSTALL_DATA) $(pcl3_root)doc$(D)$$f.1 $(DESTDIR)$(man1dir)/$$f.$(man1ext) \
 	    || exit 1;	\
-	  $(INSTALL_DATA) $(pcl3_root)doc$(D)$$f.html $(install_prefix)$(docdir) || exit 1; done
-	$(INSTALL_PROGRAM) $(BINDIR)$(D)pcl3opts$(XE) $(install_prefix)$(bindir)
+	  $(INSTALL_DATA) $(pcl3_root)doc$(D)$$f.html $(DESTDIR)$(docdir) || exit 1; done
+	$(INSTALL_PROGRAM) $(BINDIR)$(D)pcl3opts$(XE) $(DESTDIR)$(bindir)
 
 
 ### ----------------- The Xerox XES printer device --------------------- ###
@@ -945,9 +945,9 @@
 	$(GLCC) $(O_)$@ $(C_) $(JAPSRC)dviprlib.c
 
 extra-dmprt-install:
-	$(INSTALL_DATA) $(JAPSRC)dmp_init.ps $(install_prefix)$(gsdatadir)$(D)lib || exit 1
-	$(INSTALL_DATA) $(JAPSRC)dmp_site.ps $(install_prefix)$(gsdatadir)$(D)lib || exit 1
-	$(INSTALL_DATA) $(JAPSRC)escp_24.src $(install_prefix)$(gsdatadir)$(D)lib || exit 1
+	$(INSTALL_DATA) $(JAPSRC)dmp_init.ps $(DESTDIR)$(gsdatadir)$(D)lib || exit 1
+	$(INSTALL_DATA) $(JAPSRC)dmp_site.ps $(DESTDIR)$(gsdatadir)$(D)lib || exit 1
+	$(INSTALL_DATA) $(JAPSRC)escp_24.src $(DESTDIR)$(gsdatadir)$(D)lib || exit 1
 
 
 
@@ -1087,7 +1087,7 @@
 
 extra-upp-install:
 	for f in $(CONTRIBSRC)uniprint$(D)*.upp; do \
-	    $(INSTALL_DATA) $$f $(install_prefix)$(gsdatadir)$(D)lib || exit 1; \
+	    $(INSTALL_DATA) $$f $(DESTDIR)$(gsdatadir)$(D)lib || exit 1; \
 	done
 
 ### ------------ Build/Install special features ------------ ###

Modified: trunk/gs/cups/cups.mak
===================================================================
--- trunk/gs/cups/cups.mak	2007-06-26 07:08:17 UTC (rev 8076)
+++ trunk/gs/cups/cups.mak	2007-06-26 15:58:26 UTC (rev 8077)
@@ -24,9 +24,9 @@
 
 cups_=	$(GLOBJ)gdevcups.$(OBJ)
 
-CUPSSERVER= $(install_prefix)`cups-config --serverbin`
-CUPSCONFIG= $(install_prefix)`cups-config --serverroot`
-CUPSDATA= $(install_prefix)`cups-config --datadir`
+CUPSSERVER= $(DESTDIR)`cups-config --serverbin`
+CUPSCONFIG= $(DESTDIR)`cups-config --serverroot`
+CUPSDATA= $(DESTDIR)`cups-config --datadir`
 
 $(DD)cups.dev:	$(cups_) $(GLD)page.dev
 	$(ADDMOD) $(DD)cups -lib cupsimage -lib cups