$NetBSD: patch-aa,v 1.7 1999/03/04 13:50:49 tron Exp $

--- scripts/makefile.std.orig	Fri Jul 31 17:15:22 1998
+++ scripts/makefile.std	Thu Mar  4 14:15:31 1999
@@ -3,7 +3,7 @@
 # For conditions of distribution and use, see copyright notice in png.h
 
 # where make install puts libpng.a and png.h
-prefix=/usr/local
+prefix=${PREFIX}
 
 # Where the zlib library and include files are located
 #ZLIBLIB=/usr/local/lib
@@ -11,9 +11,9 @@
 ZLIBLIB=../zlib
 ZLIBINC=../zlib
 
-CC=cc
-CFLAGS=-I$(ZLIBINC) -O # -g -DPNG_DEBUG=5
-LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
+CC=${LIBTOOL} --mode=compile cc
+CFLAGS=-O # -g -DPNG_DEBUG=5
+LDFLAGS=libpng.la -lz -lm
 
 #RANLIB=echo
 RANLIB=ranlib
@@ -22,27 +22,20 @@
 	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
 	pngwtran.o pngmem.o pngerror.o pngpread.o
 
-all: libpng.a pngtest
+all: libpng.la pngtest
 
-libpng.a: $(OBJS)
-	ar rc $@  $(OBJS)
-	$(RANLIB) $@
+libpng.la: $(OBJS)
+	${LIBTOOL} --mode=link cc -o $@ ${OBJS:.o=.lo} -rpath ${PREFIX}/lib -version-info 1:1
 
-pngtest: pngtest.o libpng.a
-	$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
+pngtest: pngtest.o libpng.la
+	${LIBTOOL} --mode=link cc -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
 
 test: pngtest
 	./pngtest
 
-install: libpng.a
-	-@mkdir $(prefix)/include
-	-@mkdir $(prefix)/lib
-	cp png.h $(prefix)/include
-	cp pngconf.h $(prefix)/include
-	chmod 644 $(prefix)/include/png.h
-	chmod 644 $(prefix)/include/pngconf.h
-	cp libpng.a $(prefix)/lib
-	chmod 644 $(prefix)/lib/libpng.a
+install: libpng.la
+	${BSD_INSTALL_DATA} png.h pngconf.h $(prefix)/include
+	${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} libpng.la $(prefix)/lib
 
 clean:
 	rm -f *.o libpng.a pngtest pngout.png