1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
|
$NetBSD: patch-ab,v 1.6 2002/10/08 13:24:22 jlam Exp $
--- Imakefile.orig Tue May 29 14:32:11 2001
+++ Imakefile
@@ -47,8 +47,8 @@
#ifdef USEJPEG
#ifdef USEINSTALLEDJPEG
-JPEGLIBDIR = /usr/local/lib
-JPEGINCDIR = /usr/include/X11
+JPEGLIBDIR = $(LOCALBASE)/lib
+JPEGINCDIR = $(LOCALBASE)/include
#else
JPEGLIBDIR = ../jpeg
JPEGINCDIR = $(JPEGLIBDIR)
@@ -61,6 +61,11 @@
#define USEPNG
+#ifdef USEPNG
+PNGLIBDIR = $(LOCALBASE)/lib
+PNGINC = -I$(LOCALBASE)/include
+#endif
+
XCOMM Uncomment the #define for USEXPM if you want to use the XPM
XCOMM (color pixmap) package.
XCOMM
@@ -72,12 +77,12 @@
XCOMM Change XPMLIBDIR if necessary to point to the xpm library (libXpm)
XCOMM Change XPMINC if necessary to point to the include file for xpm (xpm.h)
-XCOMM #define USEXPM
-XCOMM #define USEXPM_ICON
+#define USEXPM
+#define USEXPM_ICON
#ifdef USEXPM
-XPMLIBDIR = $(USRLIBDIR)
-XPMINC = -I/usr/include/X11
+XPMLIBDIR = $(LOCALBASE)/lib
+XPMINC = -I$(LOCALBASE)/include/X11
#endif
XCOMM Uncomment the following definiton if you want to use the small icons
@@ -93,7 +98,7 @@
#define XAW3D
#ifdef XAW3D
-XAW3DINC = -I/usr/include/X11/Xaw3d
+XAW3DINC = -I$(LOCALBASE)/include/X11/Xaw3d
DUSEXAW3D = -DXAW3D
XAWLIB = -lXaw3d
#endif
@@ -120,7 +125,7 @@
XCOMM If your setlocale() dosen'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
@@ -131,7 +136,7 @@
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
@@ -142,7 +147,7 @@
XFIGLIBDIR = $(LIBDIR)/xfig
XCOMM now you can configure where the documentation should be located
-XFIGDOCDIR = $(LIBDIR)/xfig
+XFIGDOCDIR = $(PREFIX)/share/doc/xfig
XCOMM XFIGDOCDIR = /usr/share/doc/xfig-doc
XCOMM If your system doesn't have strstr undefine the following definition
@@ -210,7 +215,7 @@
JPEGINC = -I$(JPEGINCDIR)
#ifdef USEINSTALLEDJPEG
-JPEGLIB = -L$(JPEGLIBDIR) -ljpeg
+JPEGLIB = -Wl,-R$(LOCALBASE)/lib -L$(JPEGLIBDIR) -ljpeg
#else
JPEGCONF = configure
JPEGLIB = $(JPEGLIBDIR)/libjpeg.a
@@ -255,14 +260,14 @@
#ifdef USEPNG
DUSEPNG = -DUSE_PNG
-PNGLIBS = -lpng -lz
+PNGLIBS = -Wl,-R$(LOCALBASE)/lib -L$(PNGLIBDIR) -lpng -lz
READPNGS = f_readpng.c
READPNGO = f_readpng.o
#endif /* USEPNG */
#ifdef USEXPM
DUSEXPM = -DUSE_XPM
-XPMLIBS = -L$(XPMLIBDIR) -lXpm
+XPMLIBS = -Wl,-R$(LOCALBASE)/lib -L$(XPMLIBDIR) -lXpm
READXPMS = f_readxpm.c
READXPMO = f_readxpm.o
#ifdef USEXPM_ICON
@@ -325,7 +330,7 @@
SRCS = $(XFIGSRC)
OBJS = $(XFIGOBJ)
-EXTRA_INCLUDES = $(JPEGINC) $(XPMINC) $(XAW3DINC)
+EXTRA_INCLUDES = $(JPEGINC) $(PNGINC) $(XPMINC) $(XAW3DINC)
DEPLIBS = XawClientDepLibs
LOCAL_LIBRARIES = $(JPEGLIB)
@@ -384,6 +389,8 @@
#endif
@(cd Doc ; \
echo Copying pdf and html files to $(DESTDIR)$(XFIGDOCDIR) ; \
+ if [ -d $(DESTDIR)$(XFIGDOCDIR) ]; then set +x; \
+ else (set -x; $(MKDIRHIER) $(DESTDIR)$(XFIGDOCDIR) ); fi ; \
$(INSTALL) -m 644 -c xfig.html $(DESTDIR)$(XFIGDOCDIR) ; \
$(INSTALL) -m 644 -c xfig-howto.pdf $(DESTDIR)$(XFIGDOCDIR) ; \
if [ -d $(DESTDIR)$(XFIGDOCDIR)/html ]; then set +x; \
|
