100 lines
2.9 KiB
Plaintext
100 lines
2.9 KiB
Plaintext
--- Makefile.config.orig Sun Aug 20 01:29:00 2000
|
|
+++ Makefile.config Tue Sep 5 00:00:00 2000
|
|
@@ -39,7 +39,7 @@
|
|
#Tru64:
|
|
#CC = cc
|
|
#CC = gcc
|
|
-CC = gcc
|
|
+CC ?= gcc
|
|
|
|
# The linker.
|
|
LD = $(CC)
|
|
@@ -65,7 +65,7 @@
|
|
# calls compress or pack. Mantocat, included with Netpbm, is used on
|
|
# systems which use man pages in the "cat" format.
|
|
|
|
-MANCP = $(INSTALL) -m $(INSTALL_PERM_MAN)
|
|
+MANCP = ${BSD_INSTALL_MAN}
|
|
#DJGPP/Windows:
|
|
#MANCP = $(SRCDIR)/mantocat
|
|
|
|
@@ -79,7 +79,7 @@
|
|
# -ansi and -Werror should work too, but are not included
|
|
# by default because there's no point in daring the build to fail.
|
|
# -pedantic isn't a problem because it causes at worst a warning.
|
|
-CFLAGS = -pedantic -O3 -Wall -Wno-uninitialized $(CDEBUG)
|
|
+CFLAGS += $(CDEBUG)
|
|
# On DEC Tru64 4.0F (at least), you need -DLONG_32 for ppmtompeg.
|
|
#Tru64:
|
|
#CFLAGS = -O2 -std1 DLONG_32 $(CDEBUG)
|
|
@@ -133,7 +133,7 @@
|
|
# 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 = -fpic -DPIC
|
|
# Solaris, SunOS, and NetBSD:
|
|
#CFLAGS_SHLIB = -fpic
|
|
#CFLAGS_SHLIB = -fPIC
|
|
@@ -149,11 +149,11 @@
|
|
# but otherwise will not.
|
|
|
|
# Use the Tiff library included with Netpbm:
|
|
-TIFFHDR_DIR = $(SRCDIR)/libtiff
|
|
-TIFFLIB_DIR = $(SRCDIR)/libtiff
|
|
+#TIFFHDR_DIR = $(SRCDIR)/libtiff
|
|
+#TIFFLIB_DIR = $(SRCDIR)/libtiff
|
|
#NetBSD:
|
|
-#TIFFHDR_DIR = $(LOCALBASE)/include
|
|
-#TIFFLIB_DIR = $(LOCALBASE)/lib
|
|
+TIFFHDR_DIR = $(LOCALBASE)/include
|
|
+TIFFLIB_DIR = $(LOCALBASE)/lib
|
|
# OSF, Tru64:
|
|
#TIFFHDR_DIR = /usr/local1/DEC/include
|
|
#TIFFLIB_DIR = /usr/local1/DEC/lib
|
|
@@ -174,11 +174,11 @@
|
|
# 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/jpeg
|
|
+#JPEGHDR_DIR = /usr/include/jpeg
|
|
# Netbsd:
|
|
-#JPEGLIB_DIR = ${LOCALBASE}/lib
|
|
-#JPEGHDR_DIR = ${LOCALBASE}/include
|
|
+JPEGLIB_DIR = ${LOCALBASE}/lib
|
|
+JPEGHDR_DIR = ${LOCALBASE}/include
|
|
# OSF, Tru64:
|
|
#JPEGLIB_DIR = /usr/local1/DEC/lib
|
|
#JPEGHDR_DIR = /usr/local1/DEC/include
|
|
@@ -196,11 +196,11 @@
|
|
# 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 = /lib
|
|
+#PNGHDR_DIR = /usr/include/png
|
|
# NetBSD:
|
|
-#PNGLIB_DIR = $(LOCALBASE)/lib
|
|
-#PNGHDR_DIR = $(LOCALBASE)/include
|
|
+PNGLIB_DIR = $(LOCALBASE)/lib
|
|
+PNGHDR_DIR = $(LOCALBASE)/include
|
|
# OSF/Tru64:
|
|
#PNGLIB_DIR = /usr/local1/DEC/lib
|
|
#PNGHDR_DIR = /usr/local1/DEC/include
|
|
@@ -214,8 +214,10 @@
|
|
|
|
# And the Utah Raster Toolkit (aka URT aka RLE) library:
|
|
|
|
-URTHDR_DIR = $(SRCDIR)/urt
|
|
-URTLIB_DIR = $(SRCDIR)/urt
|
|
+#URTLIB_DIR = $(SRCDIR)/urt
|
|
+#URTHDR_DIR = $(SRCDIR)/urt
|
|
+URTLIB_DIR = NONE
|
|
+URTHDR_DIR = NONE
|
|
|
|
# These are -l options to link in the network libraries. Often, these are
|
|
# built into the standard C library, so this can be null. If you don't
|