$OpenBSD: patch-fig2dev_Imakefile,v 1.6 2008/08/28 19:02:55 sthen Exp $ --- fig2dev/Imakefile.orig Thu Oct 27 17:56:02 2005 +++ fig2dev/Imakefile Wed Aug 20 13:20:52 2008 @@ -34,7 +34,7 @@ XCOMM ****** XCOMM You should point XFIGLIBDIR to the same directory you did when you compiled XCOMM and installed xfig. -XFIGLIBDIR = /usr/local/lib/X11/xfig +XFIGLIBDIR = $(LIBDIR)/xfig XCOMM ****** XCOMM If your system doesn't have the strerror() function (has sys_errlist) then @@ -53,7 +53,7 @@ XCOMM Uncomment the following line if your compiler su 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 @@ -74,9 +74,9 @@ XCOMM Redefine the following if your PNG library, zlib XCOMM file are in different places #ifdef USEPNG -PNGLIBDIR = $(USRLIBDIR) +PNGLIBDIR = ${LOCALBASE}/lib ZLIBDIR = $(USRLIBDIR) -PNGINC = -I/usr/include/X11 +PNGINC = -I${LOCALBASE}/include/libpng #endif XCOMM **************** @@ -91,8 +91,8 @@ XCOMM #define USEXPM #ifdef USEXPM -XPMLIBDIR = $(USRLIBDIR) -XPMINC = -I/usr/include/X11 +XPMLIBDIR = ${X11BASE}/lib +XPMINC = -I${X11BASE}/include/X11 #endif XCOMM **************** @@ -141,7 +141,7 @@ XCOMM Comment out the next line if you have any proble #ifdef I18N I18N_DEFS = -DI18N -FIG2DEV_LIBDIR = /usr/local/lib/fig2dev +FIG2DEV_LIBDIR = $(LIBDIR)/fig2dev I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR=$(FIG2DEV_LIBDIR) -DFIG2DEV_LIBDIR_STR=\\\"$(FIG2DEV_LIBDIR)\\\" #endif /* I18N */ @@ -150,7 +150,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