| 1 | --- fig2dev/Imakefile.orig 2010-08-05 10:05:14.000000000 +1000 |
|---|
| 2 | +++ fig2dev/Imakefile 2010-08-05 10:05:20.000000000 +1000 |
|---|
| 3 | @@ -23,18 +23,21 @@ |
|---|
| 4 | XCOMM Also, you may have to uncomment and redefine MKDIRHIER because "make" looks |
|---|
| 5 | XCOMM for it relative to the BINDIR variable. |
|---|
| 6 | XCOMM |
|---|
| 7 | -XCOMM BINDIR = /usr/bin/X11 |
|---|
| 8 | -XCOMM MKDIRHIER = /bin/sh /usr/bin/X11/mkdirhier -p |
|---|
| 9 | +BINDIR = __PREFIX/bin |
|---|
| 10 | +DESTDIR = __DESTROOT |
|---|
| 11 | +MKDIRHIER = mkdirhier |
|---|
| 12 | |
|---|
| 13 | XCOMM MANDIR tells where the standard man pages should go (no need to change it |
|---|
| 14 | XCOMM if you want the man pages installed in the standard place on your system |
|---|
| 15 | -XCOMM MANDIR = $(MANSOURCEPATH)$(MANSUFFIX) |
|---|
| 16 | +MANDIR = __PREFIX/share/man/man$(MANSUFFIX) |
|---|
| 17 | + |
|---|
| 18 | +INSTALLFLAGS = -c |
|---|
| 19 | |
|---|
| 20 | XCOMM ****** |
|---|
| 21 | XCOMM You should point XFIGLIBDIR to the same directory you did when you compiled |
|---|
| 22 | XCOMM and installed xfig. |
|---|
| 23 | |
|---|
| 24 | -XFIGLIBDIR = /usr/local/lib/X11/xfig |
|---|
| 25 | +XFIGLIBDIR = __PREFIX/lib/X11/xfig |
|---|
| 26 | |
|---|
| 27 | XCOMM ****** |
|---|
| 28 | XCOMM If your system doesn't have the strerror() function (has sys_errlist) then |
|---|
| 29 | @@ -53,7 +56,7 @@ |
|---|
| 30 | XCOMM inline functions. With the "INLINE" keyword, you should notice that |
|---|
| 31 | XCOMM the display will be a bit faster in complex figures |
|---|
| 32 | |
|---|
| 33 | -XCOMM USEINLINE = -DUSE_INLINE |
|---|
| 34 | +USEINLINE = -DUSE_INLINE |
|---|
| 35 | |
|---|
| 36 | XCOMM **************** |
|---|
| 37 | XCOMM Change RGB if necessary, to point to your rgb.txt color database |
|---|
| 38 | @@ -74,9 +77,9 @@ |
|---|
| 39 | XCOMM file are in different places |
|---|
| 40 | |
|---|
| 41 | #ifdef USEPNG |
|---|
| 42 | -PNGLIBDIR = $(USRLIBDIR) |
|---|
| 43 | -ZLIBDIR = $(USRLIBDIR) |
|---|
| 44 | -PNGINC = -I/usr/include/X11 |
|---|
| 45 | +PNGLIBDIR = __PREFIX/lib |
|---|
| 46 | +ZLIBDIR = __PREFIX/lib |
|---|
| 47 | +PNGINC = -I__PREFIX/include |
|---|
| 48 | #endif |
|---|
| 49 | |
|---|
| 50 | XCOMM **************** |
|---|
| 51 | @@ -91,8 +94,8 @@ |
|---|
| 52 | #define USEXPM |
|---|
| 53 | |
|---|
| 54 | #ifdef USEXPM |
|---|
| 55 | -XPMLIBDIR = $(USRLIBDIR) |
|---|
| 56 | -XPMINC = -I/usr/include/X11 |
|---|
| 57 | +XPMLIBDIR = __PREFIX/lib |
|---|
| 58 | +XPMINC = -I__PREFIX/include/X11 |
|---|
| 59 | #endif |
|---|
| 60 | |
|---|
| 61 | XCOMM **************** |
|---|
| 62 | @@ -141,7 +144,7 @@ |
|---|
| 63 | |
|---|
| 64 | #ifdef I18N |
|---|
| 65 | I18N_DEFS = -DI18N |
|---|
| 66 | -FIG2DEV_LIBDIR = /usr/local/lib/fig2dev |
|---|
| 67 | +FIG2DEV_LIBDIR = __PREFIX/lib/fig2dev |
|---|
| 68 | I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR=$(FIG2DEV_LIBDIR) -DFIG2DEV_LIBDIR_STR=\\\"$(FIG2DEV_LIBDIR)\\\" |
|---|
| 69 | |
|---|
| 70 | #endif /* I18N */ |
|---|
