| 50176856 |
1 | --- xfig.3.2.2/Imakefile.config Thu Jul 2 13:37:09 1998 |
| 2 | +++ xfig.3.2.2/Imakefile Tue Jul 7 11:48:14 1998 |
| 3 | @@ -23,7 +23,7 @@ |
| 4 | XCOMM by putting the word "XCOMM" in front of it. Be sure to make a new |
| 5 | XCOMM Makefile after that ("make Makefile"). |
| 6 | |
| 7 | -#define USEGIF true |
| 8 | +XCOMM #define USEGIF true |
| 9 | |
| 10 | XCOMM If don't want to use JPEG, comment out the following line |
| 11 | |
| 12 | @@ -40,7 +40,7 @@ |
| 13 | |
| 14 | #ifdef USEJPEG |
| 15 | #ifdef USEINSTALLEDJPEG |
| 16 | -JPEGLIBDIR = /usr/local/lib |
| 17 | +JPEGLIBDIR = /usr/lib |
| 18 | #else |
| 19 | JPEGLIBDIR = ../jpeg |
| 20 | #endif |
| 21 | @@ -54,7 +54,7 @@ |
| 22 | XCOMM Uncomment the following definition for XAWLIB if you want to use |
| 23 | XCOMM the 3d Athena Widget Set (highly recommended!) |
| 24 | |
| 25 | -XCOMM XAWLIB = -lXaw3d |
| 26 | +XAWLIB = -lXaw3d |
| 27 | |
| 28 | XCOMM Uncomment the following if needed for DECstations running older X11R4 |
| 29 | XCOMM INCROOT=/usr/include/mit |
| 30 | @@ -70,12 +70,12 @@ |
| 31 | XCOMM Change XPMLIBS if necessary to point to the xpm library (libXpm) |
| 32 | XCOMM Change XPMINC if necessary to point to the include file for xpm (xpm.h) |
| 33 | |
| 34 | -XCOMM #define USEXPM |
| 35 | -XCOMM #define USEXPM_ICON |
| 36 | +#define USEXPM |
| 37 | +#define USEXPM_ICON |
| 38 | |
| 39 | #ifdef USEXPM |
| 40 | XPMLIBDIR = $(USRLIBDIR) |
| 41 | -XPMINC = -I$(INCDIR) |
| 42 | +XPMINC = -I$(INCDIR)/X11 |
| 43 | XPMLIBS = -L$(XPMLIBDIR) -lXpm |
| 44 | #endif |
| 45 | |
| 46 | @@ -101,7 +101,7 @@ |
| 47 | XCOMM inline functions. With the "INLINE" keyword, you should notice that |
| 48 | XCOMM the display will be a bit faster in complex figures |
| 49 | |
| 50 | -XCOMM USEINLINE = -DUSE_INLINE |
| 51 | +USEINLINE = -DUSE_INLINE |
| 52 | |
| 53 | XCOMM use (and change) the following if you want the multi-key data base file |
| 54 | XCOMM somewhere other than the standard X11 library directory |
| 55 | @@ -169,7 +169,7 @@ |
| 56 | |
| 57 | #ifdef USEJPEG |
| 58 | #ifdef USEINSTALLEDJPEG |
| 59 | -JPEGINCDIR = -I/usr/include/X11 |
| 60 | +JPEGINCDIR = -I/usr/include |
| 61 | JPEGLIB = -L$(JPEGLIBDIR) -ljpeg |
| 62 | #else |
| 63 | JPEGCONF = configure |
| 64 | @@ -316,35 +316,35 @@ |
| 65 | install:: |
| 66 | @echo Copying PDF documentation to $(XFIGLIBDIR) |
| 67 | @(cd Doc ; \ |
| 68 | - $(INSTALL) -c xfig-howto.pdf $(XFIGLIBDIR) ; \ |
| 69 | - $(INSTALL) -c xfig.pdf $(XFIGLIBDIR) ; \ |
| 70 | + $(INSTALL) -c xfig-howto.pdf $(DESTDIR)/$(XFIGLIBDIR) ; \ |
| 71 | + $(INSTALL) -c xfig.pdf $(DESTDIR)/$(XFIGLIBDIR) ; \ |
| 72 | echo Copying html files to $(XFIGLIBDIR)/html ; \ |
| 73 | - if [ -d $(XFIGLIBDIR)/html ]; then set +x; \ |
| 74 | - else (set -x; $(MKDIRHIER) $(XFIGLIBDIR)/html ); fi ; \ |
| 75 | - (cd html ; $(INSTALL) -c *.* $(XFIGLIBDIR)/html ; ) ;\ |
| 76 | + if [ -d $(DESTDIR)/$(XFIGLIBDIR)/html ]; then set +x; \ |
| 77 | + else (set -x; $(MKDIRHIER) $(DESTDIR)/$(XFIGLIBDIR)/html ); fi ; \ |
| 78 | + (cd html ; $(INSTALL) -c *.* $(DESTDIR)/$(XFIGLIBDIR)/html ; ) ;\ |
| 79 | echo " Copying japanese html files" ; \ |
| 80 | - if [ -d $(XFIGLIBDIR)/html/japanese ]; then set +x; \ |
| 81 | - else (set -x; $(MKDIRHIER) $(XFIGLIBDIR)/html/japanese ); fi ; \ |
| 82 | - (cd html/japanese ; $(INSTALL) -c * $(XFIGLIBDIR)/html/japanese ; ) ; \ |
| 83 | + if [ -d $(DESTDIR)/$(XFIGLIBDIR)/html/japanese ]; then set +x; \ |
| 84 | + else (set -x; $(MKDIRHIER) $(DESTDIR)/$(XFIGLIBDIR)/html/japanese ); fi ; \ |
| 85 | + (cd html/japanese ; $(INSTALL) -c * $(DESTDIR)/$(XFIGLIBDIR)/html/japanese ; ) ; \ |
| 86 | echo " Copying image files for html" ; \ |
| 87 | - if [ -d $(XFIGLIBDIR)/html/images ]; then set +x; \ |
| 88 | - else (set -x; $(MKDIRHIER) $(XFIGLIBDIR)/html/images ); fi ; \ |
| 89 | - (cd html/images ; $(INSTALL) -c * $(XFIGLIBDIR)/html/images ; ) ; \ |
| 90 | + if [ -d $(DESTDIR)/$(XFIGLIBDIR)/html/images ]; then set +x; \ |
| 91 | + else (set -x; $(MKDIRHIER) $(DESTDIR)/$(XFIGLIBDIR)/html/images ); fi ; \ |
| 92 | + (cd html/images ; $(INSTALL) -c * $(DESTDIR)/$(XFIGLIBDIR)/html/images ; ) ; \ |
| 93 | ) ; |
| 94 | @echo "Copying Fig Object Libraries" |
| 95 | @(cd Examples/Libraries ; \ |
| 96 | for d in * ; do \ |
| 97 | (cd $$d ; \ |
| 98 | - if [ -d $(OBJLIBDIR)/$$d ]; then set +x; \ |
| 99 | - else (set -x; $(MKDIRHIER) $(OBJLIBDIR)/$$d ); fi ; \ |
| 100 | + if [ -d $(DESTDIR)/$(OBJLIBDIR)/$$d ]; then set +x; \ |
| 101 | + else (set -x; $(MKDIRHIER) $(DESTDIR)/$(OBJLIBDIR)/$$d ); fi ; \ |
| 102 | echo " Copying $$d library files to $(OBJLIBDIR)/$$d" ; \ |
| 103 | for f in * ; do \ |
| 104 | if [ -d $$f ]; then ( \ |
| 105 | echo " Copying files to $(OBJLIBDIR)/$$d/$$f" ; \ |
| 106 | if [ -d $(OBJLIBDIR)/$$d/$$f ]; then set +x; \ |
| 107 | - else (set -x; $(MKDIRHIER) $(OBJLIBDIR)/$$d/$$f ); fi ; \ |
| 108 | - cd $$f ; $(INSTALL) -c * $(OBJLIBDIR)/$$d/$$f ); \ |
| 109 | - else ($(INSTALL) -c $$f $(OBJLIBDIR)/$$d ) ; fi ; \ |
| 110 | + else (set -x; $(MKDIRHIER) $(DESTDIR)/$(OBJLIBDIR)/$$d/$$f ); fi ; \ |
| 111 | + cd $$f ; $(INSTALL) -c * $(DESTDIR)/$(OBJLIBDIR)/$$d/$$f ); \ |
| 112 | + else ($(INSTALL) -c $$f $(DESTDIR)/$(OBJLIBDIR)/$$d ) ; fi ; \ |
| 113 | done ) ; \ |
| 114 | done ; ) ; |
| 115 | |
projects / packages / xfig.git / blame