[gs-cvs] rev 8634 - trunk/gs/src

[giles at ghostscript.com]

Author: giles
Date: 2008-04-10 15:08:20 -0700 (Thu, 10 Apr 2008)
New Revision: 8634

Modified:
   trunk/gs/src/jasper.mak
   trunk/gs/src/jbig2.mak
Log:
Use the correct GEN directory references. Bug 689788.


Modified: trunk/gs/src/jasper.mak
===================================================================
--- trunk/gs/src/jasper.mak	2008-04-10 07:38:46 UTC (rev 8633)
+++ trunk/gs/src/jasper.mak	2008-04-10 22:08:20 UTC (rev 8634)
@@ -167,11 +167,11 @@
 	$(CP_) $(JASGEN)jasper_$(SHARE_JPX).dev $(JASGEN)jasper.dev
 
 # external link .dev
-$(GLOBJ)jasper_1.dev : $(TOP_MAKEFILES) $(JASPER_MAK) $(ECHOGS_XE)
-	$(SETMOD) $(GLOBJ)jasper_1 -lib jasper
+$(JASGEN)jasper_1.dev : $(TOP_MAKEFILES) $(JASPER_MAK) $(ECHOGS_XE)
+	$(SETMOD) $(JASGEN)jasper_1 -lib jasper
 
 # compile in .dev
-$(GLOBJ)jasper_0.dev : $(TOP_MAKEFILES) $(JASPER_MAK) $(ECHOGS_XE) $(libjasper_OBJS)
+$(JASGEN)jasper_0.dev : $(TOP_MAKEFILES) $(JASPER_MAK) $(ECHOGS_XE) $(libjasper_OBJS)
 	$(SETMOD) $(JASGEN)jasper_0 $(libjasper_OBJS_base)
 	$(ADDMOD) $(JASGEN)jasper_0 $(libjasper_OBJS_jpc)
 	$(ADDMOD) $(JASGEN)jasper_0 $(libjasper_OBJS_jp2)

Modified: trunk/gs/src/jbig2.mak
===================================================================
--- trunk/gs/src/jbig2.mak	2008-04-10 07:38:46 UTC (rev 8633)
+++ trunk/gs/src/jbig2.mak	2008-04-10 22:08:20 UTC (rev 8634)
@@ -31,7 +31,7 @@
 JBIG2_MAK=$(GLSRC)jbig2.mak
 
 JBIG2SRC=$(JBIG2SRCDIR)$(D)
-JBIG2GEN=$(JBIG2OBJDIR)$(D)
+JBIG2GEN=$(JBIG2GENDIR)$(D)
 JBIG2OBJ=$(JBIG2OBJDIR)$(D)
 
 # This makefile is only known to work with jbig2dec v0.7 and later