$NetBSD: patch-ab,v 1.6 1998/11/12 23:36:24 frueauf Exp $

--- util/Makefile.orig	Thu Jun 26 13:22:30 1997
+++ util/Makefile	Mon Sep 14 20:26:57 1998
@@ -22,12 +22,12 @@
 # X_INC_DIR = /server/sun4/usr/new/lib/X11R4
 
 # Declare the include files and libraries for the GIF utils:
-INC = -I../lib
-GIF_LIB = ../lib/libgif.a
-GIF_INC_DEPEND = ../lib/libgif.a ../lib/gif_lib.h ../lib/getarg.h
+CFLAGS+= -I../lib
+GIF_LIB = ../lib/libgif.la
+GIF_INC_DEPEND = ../lib/libgif.la ../lib/gif_lib.h ../lib/getarg.h
 
 # Where to copy executables to:
-DEST = /usr/bin
+DEST = ${PREFIX}/bin
 
 # These are the flags for gcc, in BSD4.3 or Sun O.S. 4.0.3
 #
@@ -81,14 +81,14 @@
 
 # Linux using XFree86
 #
-CC = gcc
+#CC = gcc
 #CFLAGS = $(INC) -fno-builtin -O -s -W -Wreturn-type -Wcomment
-CFLAGS = $(INC) -fno-builtin -g -W -Wreturn-type -Wcomment
-XLIBS = -lX11
+#CFLAGS = $(INC) -fno-builtin -g -W -Wreturn-type -Wcomment
+#XLIBS = -lX11
 X_INC_DIR = /usr/X11/include
 X_LIB_DIR = /usr/X11/lib
 
-BINARIES = gif2epsn gif2ps gif2rgb gif2x11 gifasm gifbg \
+BINARIES = gif2epsn gif2ps gif2rgb gifasm gifbg \
 	gifclip gifclrmp gifcomb giffix gifflip gifhisto \
 	gifinter gifinto gifovly gifpos gifrotat gifrsize giftext \
 	gifwedge raw2gif rgb2gif text2gif gifspnge giffiltr \
@@ -105,7 +105,8 @@
 iris: $(IRIS)
 
 install-all:
-	cp $(BINARIES) $(SCRIPTS) $(DEST)
+	${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} $(BINARIES) $(DEST)
+	${BSD_INSTALL_SCRIPT} $(SCRIPTS) $(DEST)
 
 install-rle:
 	cp $(RLE) $(DEST)
@@ -114,7 +115,7 @@
 	cp $(IRIS) $(DEST)
 
 .c:
-	$(CC) $(CFLAGS) $< $(GIF_LIB) -lm $(LDFLAGS) -o $*
+	${LIBTOOL} --mode=link $(CC) $(CFLAGS) $< $(GIF_LIB) -lm $(LDFLAGS) -L$(X_LIB_DIR) $(XLIBS) -o $*
 
 uninstall-utils:
 	(cd $(DEST); rm -f $(BINARIES) $(RLE) $(IRIS) $(SCRIPTS))