124 lines
3.9 KiB
Plaintext
124 lines
3.9 KiB
Plaintext
$NetBSD: patch-ab,v 1.15 2015/10/14 20:17:26 wiz Exp $
|
|
|
|
--- Imakefile.orig 2009-03-30 15:53:05.000000000 +0000
|
|
+++ Imakefile
|
|
@@ -60,23 +60,26 @@ XCOMM Uncomment the following if you hav
|
|
XCOMM some new features, including "Tips", which replace xfig's "help balloons"
|
|
XCOMM NOTE: This is the default for many X systems now.
|
|
|
|
-XCOMM #define XAW3D1_5E
|
|
+#define XAW3D1_5E
|
|
|
|
#ifdef XAW3D1_5E
|
|
DUSEXAW3D = -DXAW3D -DXAW3D1_5E
|
|
#else
|
|
- XAW_SRC = w_menuentry.c SmeCascade.c SmeBSB.c SimpleMenu.c
|
|
- XAW_OBJ = w_menuentry.o SmeCascade.o SmeBSB.o SimpleMenu.o
|
|
# ifdef XAW3D
|
|
- DUSEXAW3D = -DXAW3D
|
|
+ DUSEXAW3D = -DXAW3D
|
|
+ XAW_SRC = SmeCascade.c
|
|
+ XAW_OBJ = SmeCascade.o
|
|
+#else
|
|
+ XAW_SRC = w_menuentry.c SmeCascade.c SmeBSB.c SimpleMenu.c
|
|
+ XAW_OBJ = w_menuentry.o SmeCascade.o SmeBSB.o SimpleMenu.o
|
|
# endif /* XAW3D */
|
|
#endif /* XAW3D1_5E */
|
|
|
|
XCOMM Redefine the following if your PNG library, zlib library and/or include file
|
|
XCOMM are in different places
|
|
|
|
-PNGLIBDIR = $(USRLIBDIR)
|
|
-PNGINC = -I/usr/local/include
|
|
+PNGLIBDIR = $(LOCALBASE)/lib
|
|
+PNGINC = -I$(LOCALBASE)/include
|
|
ZLIBDIR = $(USRLIBDIR)
|
|
|
|
XCOMM If don't want JPEG support, comment out the #define USEJPEG line
|
|
@@ -96,11 +99,11 @@ XCOMM You must have version 5b or newer
|
|
|
|
#ifdef USEJPEG
|
|
#ifdef USEINSTALLEDJPEG
|
|
- JPEGLIBDIR = /usr/local/lib
|
|
- JPEGINC = -I/usr/include/X11
|
|
+ JPEGLIBDIR = $(LOCALBASE)/lib
|
|
+ JPEGINC = -I$(LOCALBASE)/include
|
|
#else
|
|
- JPEGLIBDIR = ../jpeg
|
|
- JPEGINC = -I$(JPEGLIBDIR)
|
|
+ JPEGLIBDIR = ../jpeg
|
|
+ JPEGINC = -I$(JPEGLIBDIR)
|
|
#endif /* USEINSTALLEDJPEG */
|
|
#endif /* USEJPEG */
|
|
|
|
@@ -119,8 +122,8 @@ XCOMM Change XPMINC if necessary to poin
|
|
#define USEXPM_ICON
|
|
|
|
#ifdef USEXPM
|
|
-XPMLIBDIR = /usr/local/lib
|
|
-XPMINC = -I/usr/local/include/X11
|
|
+XPMLIBDIR = $(X11BASE)/lib
|
|
+XPMINC = -I$(X11BASE)/include/X11
|
|
#endif
|
|
|
|
XCOMM Uncomment the following definiton if you want to use the small icons
|
|
@@ -150,7 +153,7 @@ XCOMM Comment out the next line if you h
|
|
XCOMM If your setlocale() doesn't support the locale, you should
|
|
XCOMM add -DSETLOCALE to I18N_DEFS.
|
|
|
|
-XCOMM #define I18N
|
|
+#define I18N
|
|
|
|
XCOMM If using an input tablet uncomment the following
|
|
|
|
@@ -161,7 +164,7 @@ XCOMM uncomment the following line if yo
|
|
XCOMM inline functions. With the "INLINE" keyword, you should notice that
|
|
XCOMM the display will be a bit faster in complex figures
|
|
|
|
-XCOMM USEINLINE = -DUSE_INLINE
|
|
+USEINLINE = -DUSE_INLINE
|
|
|
|
XCOMM use (and change) the following if you want the multi-key data base file
|
|
XCOMM somewhere other than the standard X11 library directory
|
|
@@ -173,11 +176,11 @@ XFIGLIBDIR = $(LIBDIR)/xfig
|
|
|
|
XCOMM XFIGDOCDIR tells where the html and pdf documentation should go
|
|
XCOMM XFIGDOCDIR = $(DOCDIR)/xfig
|
|
-XFIGDOCDIR = /usr/local/xfig/doc
|
|
+XFIGDOCDIR = $(PREFIX)/share/doc/xfig
|
|
|
|
XCOMM MANDIR tells where the standard man pages should go (no need to change it
|
|
XCOMM if you want the man pages installed in the standard place on your system
|
|
-MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
|
|
+XCOMM MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
|
|
XCOMM MANDIR = /usr/local/xfig/man
|
|
|
|
XCOMM If your system doesn't have strstr undefine the following definition
|
|
@@ -241,7 +244,7 @@ INSTDATFLAGS = -m 0644
|
|
#ifdef USEJPEG
|
|
|
|
#ifdef USEINSTALLEDJPEG
|
|
-JPEGLIB = -L$(JPEGLIBDIR) -ljpeg
|
|
+JPEGLIB = -Wl,-R$(LOCALBASE)/lib -L$(JPEGLIBDIR) -ljpeg
|
|
#else
|
|
JPEGCONF = configure
|
|
JPEGLIB = $(JPEGLIBDIR)/libjpeg.a
|
|
@@ -278,7 +281,7 @@ InstallManPageLong(file,dest,file)
|
|
DUSESMALLICONS = -DUSE_SMALL_ICONS
|
|
#endif /* USESMALLICONS */
|
|
|
|
-PNGLIBS = -L$(PNGLIBDIR) -lpng -L$(ZLIBDIR) -lz
|
|
+PNGLIBS = -Wl,-R$(LOCALBASE)/lib -L$(PNGLIBDIR) -lpng -lz
|
|
|
|
#ifdef USEJPEG
|
|
DUSEJPEG = -DUSE_JPEG
|
|
@@ -288,7 +291,7 @@ READJPEGO = f_readjpg.o
|
|
|
|
#ifdef USEXPM
|
|
DUSEXPM = -DUSE_XPM
|
|
-XPMLIBS = -L$(XPMLIBDIR) -lXpm
|
|
+XPMLIBS = -Wl,-R$(XPMLIBDIR) -L$(XPMLIBDIR) -lXpm
|
|
READXPMS = f_readxpm.c
|
|
READXPMO = f_readxpm.o
|
|
#ifdef USEXPM_ICON
|