[gs-cvs] rev 9104 - trunk/gs/base

[giles at ghostscript.com]

Author: giles
Date: 2008-09-18 16:55:26 -0700 (Thu, 18 Sep 2008)
New Revision: 9104

Modified:
   trunk/gs/base/devs.mak
   trunk/gs/base/libpng.mak
Log:
Remove a spurious $(_I) and add use portable $(D_)...$(_D) for defines
as needed by the openvms build. Bug 690084.


Modified: trunk/gs/base/devs.mak
===================================================================
--- trunk/gs/base/devs.mak	2008-09-18 23:50:07 UTC (rev 9103)
+++ trunk/gs/base/devs.mak	2008-09-18 23:55:26 UTC (rev 9104)
@@ -253,7 +253,7 @@
 
 GDEVLDFJB2CC=$(CC_) $(I_)$(GLI_) $(II)$(LDF_JB2I_)$(_I) $(JB2CF_) $(GLF_)
 GDEVLWFJPXCC=$(CC_) $(I_)$(GLI_) $(II)$(LWF_JPXI_)$(_I) $(JPXCF_) $(GLF_)
-GDEVLWFJB2JPXCC=$(CC_) $(I_)$(GLI_)  $(II)$(LDF_JB2I_)$(_I) $(II)$(LWF_JPXI_)$(_I) $(JB2CF_) $(JPXCF_) $(GLF_)
+GDEVLWFJB2JPXCC=$(CC_) $(I_)$(GLI_)  $(II)$(LDF_JB2I_) $(II)$(LWF_JPXI_)$(_I) $(JB2CF_) $(JPXCF_) $(GLF_)
 
 ###### ----------------------- Device support ----------------------- ######
 

Modified: trunk/gs/base/libpng.mak
===================================================================
--- trunk/gs/base/libpng.mak	2008-09-18 23:50:07 UTC (rev 9103)
+++ trunk/gs/base/libpng.mak	2008-09-18 23:55:26 UTC (rev 9104)
@@ -56,7 +56,7 @@
 PZGEN=$(ZGENDIR)$(D)
 
 # PI_ and PF_ are defined in gs.mak.
-PNGCC=$(CC_) $(I_)$(PI_)$(_I) $(PF_) -DPNG_NO_ASSEMBLER_CODE
+PNGCC=$(CC_) $(I_)$(PI_)$(_I) $(PF_) $(D_)PNG_NO_ASSEMBLER_CODE$(_D)
 
 # Define the name of this makefile.
 LIBPNG_MAK=$(GLSRC)libpng.mak