d5668860af
- remove DESTDIR from one location where it should not be and could possibly cause problems.
85 lines
2.7 KiB
Plaintext
85 lines
2.7 KiB
Plaintext
--- fig2dev/Imakefile.orig Thu Apr 19 13:19:38 2001
|
|
+++ fig2dev/Imakefile Tue Jun 19 15:31:27 2001
|
|
@@ -28,13 +28,13 @@ XCOMM ******
|
|
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 = $(LIBDIR)/xfig
|
|
|
|
XCOMM ******
|
|
XCOMM If your system has the strerror() function (doesn't have sys_errlist) then
|
|
XCOMM comment out NEED_STRERROR with an XCOMM comment.
|
|
|
|
-NEED_STRERROR = -DNEED_STRERROR
|
|
+XCOMM NEED_STRERROR = -DNEED_STRERROR
|
|
|
|
XCOMM The following probably only applies to Windows 9x/NT:
|
|
XCOMM If your system can open files in text and binary modes and has the
|
|
@@ -47,7 +47,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 ****************
|
|
XCOMM Change RGB if necessary, to point to your rgb.txt color database
|
|
@@ -65,8 +65,8 @@ XCOMM PNG (Portable Network Graphics) fi
|
|
#define USEPNG
|
|
|
|
#ifdef USEPNG
|
|
-PNGLIBDIR = $(USRLIBDIR)
|
|
-PNGINC = -I/usr/include/X11
|
|
+PNGLIBDIR = ${LOCALBASE}/lib
|
|
+PNGINC = -I${LOCALBASE}/include
|
|
#endif
|
|
|
|
XCOMM ****************
|
|
@@ -78,11 +78,11 @@ XCOMM Change XPMLIBDIR if necessary to p
|
|
XCOMM Change XPMINC if necessary to point to the include file for xpm (xpm.h)
|
|
XCOMM
|
|
|
|
-XCOMM #define USEXPM
|
|
+#define USEXPM
|
|
|
|
#ifdef USEXPM
|
|
-XPMLIBDIR = $(USRLIBDIR)
|
|
-XPMINC = -I/usr/include/X11
|
|
+XPMLIBDIR = ${X11BASE}/lib
|
|
+XPMINC = -I${X11BASE}/include/X11
|
|
#endif
|
|
|
|
XCOMM ****************
|
|
@@ -104,8 +104,8 @@ XCOMM You must have version 5b or newer
|
|
|
|
#ifdef USEJPEG
|
|
#ifdef USEINSTALLEDJPEG
|
|
-JPEGLIBDIR = /usr/local/lib
|
|
-JPEGINCDIR = /usr/include/X11
|
|
+JPEGLIBDIR = ${LOCALBASE}/lib
|
|
+JPEGINCDIR = ${LOCALBASE}/include
|
|
#else
|
|
JPEGLIBDIR = ../jpeg
|
|
JPEGINCDIR = $(JPEGLIBDIR)
|
|
@@ -158,8 +158,8 @@ XCOMM Uncomment the next line if you wan
|
|
|
|
#ifdef I18N
|
|
I18N_DEFS = -DI18N
|
|
-FIG2DEV_LIBDIR = /usr/local/lib/fig2dev
|
|
-I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR=\\\"$(FIG2DEV_LIBDIR)\\\"
|
|
+FIG2DEV_LIBDIR = $(LIBDIR)/fig2dev
|
|
+I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR='\"$(FIG2DEV_LIBDIR)\"'
|
|
|
|
install::
|
|
[ -d $(DESTDIR)$(FIG2DEV_LIBDIR) ] || mkdir $(DESTDIR)$(FIG2DEV_LIBDIR)
|
|
@@ -185,7 +185,7 @@ XCOMM **********************************
|
|
XCOMM *** You shouldn't have to change anything below this point ***
|
|
XCOMM **************************************************************
|
|
|
|
-DIR_DEFS= -DBITMAPDIR=\\\"$(DESTDIR)$(XFIGLIBDIR)/bitmaps\\\"
|
|
+DIR_DEFS= -DBITMAPDIR=\\\"$(XFIGLIBDIR)/bitmaps\\\"
|
|
|
|
#ifdef USEPNG
|
|
DUSEPNG = -DUSE_PNG
|