2000-06-22 10:11:34 +02:00
|
|
|
$NetBSD: patch-aa,v 1.5 2000/06/22 08:11:35 itohy Exp $
|
1998-08-07 13:08:53 +02:00
|
|
|
|
2000-06-22 10:11:34 +02:00
|
|
|
--- fig2dev/Imakefile.orig Fri Jan 14 12:59:04 2000
|
|
|
|
|
+++ fig2dev/Imakefile Thu Jun 22 00:01:06 2000
|
|
|
|
|
@@ -27,7 +27,7 @@
|
1998-07-03 16:24:42 +02:00
|
|
|
XCOMM You should point XFIGLIBDIR to the same directory you did when you compiled
|
|
|
|
|
XCOMM and installed xfig. This will be made automatic in the future.
|
|
|
|
|
|
|
|
|
|
-XFIGLIBDIR = /usr/local/lib/X11/xfig
|
|
|
|
|
+XFIGLIBDIR = $(PROJECTROOT)/lib/X11/xfig
|
|
|
|
|
|
|
|
|
|
XCOMM If your system has the strerror() function (doesn't have sys_errlist) then
|
|
|
|
|
XCOMM comment out NEED_STRERROR with an XCOMM comment.
|
2000-06-22 10:11:34 +02:00
|
|
|
@@ -54,11 +54,11 @@
|
|
|
|
|
XCOMM Change XPMINC if necessary to point to the include file for xpm (xpm.h)
|
1998-07-03 16:24:42 +02:00
|
|
|
XCOMM
|
1998-02-09 00:20:43 +01:00
|
|
|
|
|
|
|
|
-XCOMM #define USEXPM
|
|
|
|
|
+#define USEXPM
|
|
|
|
|
|
|
|
|
|
#ifdef USEXPM
|
|
|
|
|
XPMLIBDIR = $(USRLIBDIR)
|
2000-06-22 10:11:34 +02:00
|
|
|
-XPMINC = -I/usr/include/X11
|
1998-02-09 00:20:43 +01:00
|
|
|
+XPMINC = -I$(INCDIR)/X11
|
2000-06-22 10:11:34 +02:00
|
|
|
#endif
|
1998-02-09 00:20:43 +01:00
|
|
|
|
2000-06-22 10:11:34 +02:00
|
|
|
XCOMM For Linux machines or any machines that have a separate library for
|
|
|
|
|
@@ -87,8 +87,8 @@
|
|
|
|
|
|
|
|
|
|
#ifdef USEJPEG
|
1998-02-09 00:20:43 +01:00
|
|
|
#ifdef USEINSTALLEDJPEG
|
|
|
|
|
-JPEGLIBDIR = /usr/local/lib
|
|
|
|
|
-JPEGINCDIR = /usr/include/X11
|
|
|
|
|
+JPEGLIBDIR = $(LOCALBASE)/lib
|
|
|
|
|
+JPEGINCDIR = $(LOCALBASE)/include
|
2000-06-22 10:11:34 +02:00
|
|
|
#else
|
|
|
|
|
JPEGLIBDIR = ../jpeg
|
|
|
|
|
JPEGINCDIR = $(JPEGLIBDIR)
|
|
|
|
|
@@ -127,12 +127,12 @@
|
|
|
|
|
|
|
|
|
|
XCOMM Uncomment the next line if you want use Japanese (i18n) on xfig.
|
|
|
|
|
|
|
|
|
|
-XCOMM #define I18N
|
|
|
|
|
+#define I18N
|
|
|
|
|
|
|
|
|
|
#ifdef I18N
|
|
|
|
|
I18N_DEFS = -DI18N
|
|
|
|
|
-FIG2DEV_LIBDIR = /usr/local/lib/fig2dev
|
|
|
|
|
-I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR='\"/usr/local/lib/fig2dev\"'
|
|
|
|
|
+FIG2DEV_LIBDIR = $(PROJECTROOT)/lib/fig2dev
|
|
|
|
|
+I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR='\"$(FIG2DEV_LIBDIR)\"'
|
|
|
|
|
|
|
|
|
|
install::
|
|
|
|
|
[ -d $(FIG2DEV_LIBDIR) ] || mkdir $(FIG2DEV_LIBDIR)
|
|
|
|
|
@@ -177,8 +177,8 @@
|
|
|
|
|
DUSEJPEG = -DUSE_JPEG
|
|
|
|
|
|
|
|
|
|
#ifdef USEINSTALLEDJPEG
|
|
|
|
|
-JPEGLIBDIR = /usr/local/lib
|
|
|
|
|
-JPEGLIB = -L$(JPEGLIBDIR) -ljpeg
|
|
|
|
|
+JPEGLIBDIR = $(LOCALBASE)/lib
|
1999-01-19 18:22:11 +01:00
|
|
|
+JPEGLIB = -Wl,-R$(JPEGLIBDIR) -L$(JPEGLIBDIR) -ljpeg
|
1998-02-09 00:20:43 +01:00
|
|
|
#else
|
1998-07-03 16:24:42 +02:00
|
|
|
XCOMM this is relative to this directory (transfig/fig2dev)
|
1999-01-19 18:22:11 +01:00
|
|
|
JPEGLIBDIR = ../../jpeg-6a
|
2000-06-22 10:11:34 +02:00
|
|
|
@@ -189,7 +189,7 @@
|
|
|
|
|
|
|
|
|
|
#endif /* USEJPEG */
|
|
|
|
|
|
|
|
|
|
-IMAKE_DEFINES = $(DUSEJPEG) $(DUSEXPM)
|
|
|
|
|
+IMAKE_DEFINES = $(DUSEJPEG) $(DJPEGINC) $(DUSEXPM)
|
|
|
|
|
|
|
|
|
|
DEVDEFINES = $(DUSEJPEG) $(DUSEXPM) $(XPMINC) $(DDNFSS) $(DDA4) \
|
|
|
|
|
$(DDLATEX2E_GRAPHICS) $(DDEPSFIG) $(DDIBMGEC) $(DDDVIPS) $(I18N_DEV_DEFS)
|
