summaryrefslogtreecommitdiff
blob: 72abad3896b1a68888fd0fb3014a1df4fc6a7209 (plain)
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
diff -ur netpbm-9.10.orig/Makefile.config netpbm-9.10/Makefile.config
--- netpbm-9.10.orig/Makefile.config	Sun Jan  7 13:52:54 2001
+++ netpbm-9.10/Makefile.config	Wed Feb 21 00:17:39 2001
@@ -50,7 +50,7 @@
 
 # MAKE is set automatically by Make to what was used to invoke Make.
 
-INSTALL = ginstall
+#INSTALL = ginstall
 #Solaris:
 #INSTALL = /usr/ucb/install
 #Tru64:
@@ -58,13 +58,13 @@
 #OSF1:
 #INSTALL = installosf
 #Red Hat Linux:
-#INSTALL = install
+INSTALL = install
 
 # STRIPFLAG is the option you pass to the above install program to make it
 # strip unnecessary information out of binaries.
-STRIPFLAG = -s
+#STRIPFLAG = -s
 # If you don't want to strip the binaries, just leave it null:
-#STRIPFLAG = 
+STRIPFLAG = 
 
 # Normally the man pages are installed using "install".  But via this
 # variable, you can use something else, for example a script that
@@ -139,10 +139,10 @@
 # independent code, so you need -fpic or fPIC here.  (The rule is: if 
 # -fpic works, use it.  If it bombs, go to fPIC).
 
-CFLAGS_SHLIB = 
+#CFLAGS_SHLIB = 
 # Solaris, SunOS, and NetBSD:
 #CFLAGS_SHLIB = -fpic
-#CFLAGS_SHLIB = -fPIC
+CFLAGS_SHLIB = -fPIC
 
 # The netpbm package contains a version of the Tiff library,
 # libtiff.  If you want to use your own, fill in the appropriate paths
@@ -155,8 +155,8 @@
 # but otherwise will not.
 
 # Use the Tiff library included with Netpbm:
-TIFFHDR_DIR = $(SRCDIR)/libtiff
-TIFFLIB_DIR = $(SRCDIR)/libtiff
+TIFFHDR_DIR = /usr/local/include
+TIFFLIB_DIR = /usr/local/lib
 #NetBSD:
 #TIFFHDR_DIR = $(LOCALBASE)/include
 #TIFFLIB_DIR = $(LOCALBASE)/lib
@@ -166,7 +166,7 @@
 
 # If your Tiff library depends on libraries other than libc and libm, 
 # put the required linker options here.
-TIFFLIB_LDFLAGS =
+TIFFLIB_LDFLAGS = -ljpeg -lz
 # libtiff 3.5.5 with the lzw patch needs libz:
 #TIFFLIB_LDFLAGS = -lz
 
@@ -186,8 +186,8 @@
 # at least JPEGLIB_DIR here, or the tiff converters will not build at
 # all.
 
-JPEGLIB_DIR = /usr/lib/jpeg
-JPEGHDR_DIR = /usr/include/jpeg
+JPEGLIB_DIR = /usr/lib
+JPEGHDR_DIR = /usr/include
 # Netbsd:
 #JPEGLIB_DIR = ${LOCALBASE}/lib
 #JPEGHDR_DIR = ${LOCALBASE}/include
@@ -208,8 +208,8 @@
 # here.  If you do not have the PNG library, and still want to
 # successully build everything else, put NONE for these.
 
-PNGLIB_DIR = /lib
-PNGHDR_DIR = /usr/include/png
+PNGLIB_DIR = /usr/lib
+PNGHDR_DIR = /usr/include
 # NetBSD:
 #PNGLIB_DIR = $(LOCALBASE)/lib
 #PNGHDR_DIR = $(LOCALBASE)/include
@@ -281,7 +281,7 @@
 #INSTALL_PREFIX = /djgpp
 # Typical:
 #INSTALL_PREFIX = /usr/local/
-INSTALL_PREFIX = /usr/local/netpbm
+INSTALL_PREFIX = /usr
 
 # Some people specify PREFIX= on the command line, because that's conventional
 ifneq ($(PREFIX)x,x)
@@ -321,7 +321,7 @@
 # Specify the directory where you want data files that the Neptbm programs
 # access to be installed
 
-INSTALLDATA = $(INSTALL_PREFIX)/lib
+INSTALLDATA = $(INSTALL_PREFIX)/share/netpbm
 
 
 #NETPBMLIBSUFFIX is the suffix on the filename of the generated and installed
@@ -335,8 +335,3 @@
   NETPBMLIBSUFFIX = so
   LIBTIFFSUFFIX = so
 endif
-
-
-
-
-