--- Makefile.in.orig 2008-10-02 14:33:22.000000000 -0500 +++ Makefile.in 2009-08-13 00:36:52.000000000 -0500 @@ -47,9 +47,8 @@ # the directories also define the default search path for the # initialization files (gs_*.ps) and the fonts. -INSTALL = $(GLSRCDIR)/instcopy -c -INSTALL_PROGRAM = $(INSTALL) -m 755 -INSTALL_DATA = $(INSTALL) -m 644 +INSTALL_PROGRAM = ${BSD_INSTALL_SCRIPT} +INSTALL_DATA = ${BSD_INSTALL_DATA} INSTALL_SHARED = @INSTALL_SHARED@ prefix = @prefix@ @@ -155,7 +154,7 @@ # some older JPEG streams that violate the standard. If the JPEG # library built from local sources, the patch will be applied. -SHARE_JPEG=@SHARE_LIBJPEG@ +SHARE_JPEG=1 JPEG_NAME=jpeg # Define the directory where the PNG library sources are stored, @@ -163,14 +162,14 @@ # You may need to change this if the libpng version changes. # See libpng.mak for more information. -SHARE_LIBPNG=@SHARE_LIBPNG@ +SHARE_LIBPNG=1 PNGSRCDIR=@LIBPNGDIR@ LIBPNG_NAME=png # Define the directory where the zlib sources are stored. # See zlib.mak for more information. -SHARE_ZLIB=@SHARE_ZLIB@ +SHARE_ZLIB=1 ZSRCDIR=@ZLIBDIR@ #ZLIB_NAME=gz ZLIB_NAME=z @@ -241,7 +240,7 @@ # Define the added flags for standard, debugging, profiling # and shared object builds. -CFLAGS_STANDARD=@OPT_CFLAGS@ +CFLAGS_STANDARD?=@OPT_CFLAGS@ CFLAGS_DEBUG=-g -O0 CFLAGS_PROFILE=-pg @OPT_CFLAGS@ CFLAGS_SO=@DYNAMIC_CFLAGS@ @@ -286,7 +285,7 @@ # Solaris may need -lnsl -lsocket -lposix4. # (Libraries required by individual drivers are handled automatically.) -EXTRALIBS=@LIBS@ @DYNAMIC_LIBS@ @FONTCONFIG_LIBS@ +EXTRALIBS=@LIBS@ @DYNAMIC_LIBS@ @FONTCONFIG_LIBS@ -Wl,-export-dynamic # Define the standard libraries to search at the end of linking. # Most platforms require -lpthread for the POSIX threads library; @@ -329,8 +328,8 @@ # If POSIX sync primitives are used, also change the STDLIBS to include # the pthread library. Otherwise use SYNC=nosync #SYNC=posync -#SYNC=nosync -SYNC=@SYNC@ +SYNC=nosync +#SYNC=posync # programs we use RM=rm -f @@ -477,6 +476,7 @@ # ---------------- End of platform-specific section ---------------- # INSTALL_CONTRIB=@INSTALL_CONTRIB@ +include $(GLSRCDIR)/drivers.mak include $(GLSRCDIR)/unixhead.mak include $(GLSRCDIR)/gs.mak # psromfs.mak must precede lib.mak