mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-27 21:29:02 +00:00
100 lines
2.7 KiB
Plaintext
100 lines
2.7 KiB
Plaintext
--- Makefile.config.orig Tue May 9 09:32:59 2000
|
|
+++ Makefile.config Sat May 20 00:00:00 2000
|
|
@@ -38,12 +38,12 @@
|
|
# The C compiler (including macro preprocessor)
|
|
#CC = cc
|
|
#CC = gcc
|
|
-CC = gcc -fpcc-struct-return
|
|
+CC ?= gcc -fpcc-struct-return
|
|
|
|
# The linker.
|
|
#LD = ld
|
|
#LD = cc
|
|
-LD = gcc
|
|
+LD = ${CC}
|
|
|
|
# Normally the man pages are installed using "install". But via this
|
|
# variable, you can use something else, for example a script that
|
|
@@ -51,7 +51,7 @@
|
|
# systems which use man pages in the "cat" format.
|
|
|
|
#MANCP = $(SRCDIR)/mantocat
|
|
-MANCP = $(INSTALL) -m$(INSTALL_PERM_MAN)
|
|
+MANCP = ${BSD_INSTALL_MAN}
|
|
|
|
# MAKE is set automatically by Make to what was used to invoke Make.
|
|
SHELL = /bin/sh
|
|
@@ -66,7 +66,7 @@
|
|
|
|
# On DEC Tru64 4.0F (at least), you need -DLONG_32 for ppmtompeg.
|
|
#CFLAGS = -O2 -std1 DLONG_32 $(CDEBUG)
|
|
-CFLAGS = -pedantic -O2 -Wall -Wno-uninitialized $(CDEBUG)
|
|
+CFLAGS += $(CDEBUG)
|
|
|
|
# EXE is a suffix that the linker puts on any executable it generates.
|
|
# In cygwin, this is .exe and most program deal with its existence without
|
|
@@ -113,7 +113,7 @@
|
|
|
|
#CFLAGS_SHLIB = -fpic
|
|
#CFLAGS_SHLIB = -fPIC
|
|
-CFLAGS_SHLIB =
|
|
+CFLAGS_SHLIB = -fPIC -DPIC
|
|
|
|
# The netpbm package contains a version of the Tiff library,
|
|
# libtiff. If you want to use your own, fill in the appropriate paths
|
|
@@ -126,13 +126,13 @@
|
|
# but otherwise will not.
|
|
|
|
#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
|
|
-TIFFHDR_DIR = $(SRCDIR)/libtiff
|
|
-TIFFLIB_DIR = $(SRCDIR)/libtiff
|
|
+#TIFFHDR_DIR = $(SRCDIR)/libtiff
|
|
+#TIFFLIB_DIR = $(SRCDIR)/libtiff
|
|
|
|
# Put the location of your JPEG library here.
|
|
# If you want to build the jpeg converters or tiff
|
|
@@ -151,8 +151,8 @@
|
|
# all.
|
|
|
|
# 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
|
|
@@ -160,8 +160,8 @@
|
|
#JPEGHDR_DIR = /usr/local/include
|
|
#JPEGLIB_DIR = NONE
|
|
#JPEGHDR_DIR = NONE
|
|
-JPEGLIB_DIR = /usr/lib/jpeg
|
|
-JPEGHDR_DIR = /usr/include/jpeg
|
|
+#JPEGLIB_DIR = /usr/lib/jpeg
|
|
+#JPEGHDR_DIR = /usr/include/jpeg
|
|
|
|
|
|
# Put the location of your PNG library here. If you want to build the
|
|
@@ -180,10 +180,10 @@
|
|
#PNGLIB_DIR = /usr/local/lib
|
|
#PNGHDR_DIR = /usr/local/include
|
|
# No PNG:
|
|
-#PNGLIB_DIR = NONE
|
|
-#PNGHDR_DIR = NONE
|
|
-PNGLIB_DIR = /lib
|
|
-PNGHDR_DIR = /usr/include/png
|
|
+PNGLIB_DIR = NONE
|
|
+PNGHDR_DIR = NONE
|
|
+#PNGLIB_DIR = /lib
|
|
+#PNGHDR_DIR = /usr/include/png
|
|
|
|
|
|
# And the Utah Raster Toolkit (aka URT aka RLE) library:
|