Imported from libpng-1.2.3rc5.tar

2025-07-10 18:04:09 +02:00 · 2002-05-10 20:19:58 -05:00
parent 704228f7e7
commit 837a3d1745
63 changed files with 861 additions and 489 deletions
--- a/scripts/libpng-config
+++ b/scripts/libpng-config
@@ -1,92 +0,0 @@
-#! /bin/sh
-
-# libpng12-config
-# provides configuration info for libpng12.
-
-# Copyright (C) 2002 Glenn Randers-Pehrson
-# For conditions of distribution and use, see copyright notice in png.h
-
-# Modeled after libxml-config, fixed to handle --prefix properly.
-
-prefix=/usr/local
-exec_prefix=${prefix}
-includedir=${prefix}/include
-
-usage()
-{
-    cat <<EOF
-Usage: libpng12-config [OPTION] ...
-
-Known values for OPTION are:
-
-  --prefix=DIR		change libpng12 prefix [default $prefix]
-  --libs		print library linking information
-  --cflags		print compiler flags
-  --cppflags		print pre-processor flags
-  --ldflags		print loader flags
-  --help		display this help and exit
-  --version		output version information
-EOF
-
-    exit $1
-}
-
-if test $# -eq 0; then
-    usage 1
-fi
-
-cflags=false
-cppflags=false
-ldflags=false
-libs=false
-
-while test $# -gt 0; do
-    case "$1" in
-    -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-    *) optarg= ;;
-    esac
-
-    case "$1" in
-    --prefix=*)
-	prefix=$optarg
-	exec_prefix=${prefix}
-	includedir=${prefix}/include
-	;;
-
-    --prefix)
-	echo $prefix
-	;;
-
-    --version)
-	echo 1.2.3rc4
-	exit 0
-	;;
-
-    --help)
-	usage 0
-	;;
-
-    --cflags)
-        ;;
-
-    --cppflags)
-       	echo -I${includedir}/libpng12
-       	;;
-
-    --libs)
-       	echo -lpng12
-        ;;
-
-    --ldflags)
-       	echo -L${exec_prefix}/lib
-       	;;
-
-    *)
-	usage
-	exit 1
-	;;
-    esac
-    shift
-done
-
-exit 0
--- a/scripts/libpng-config-body.in
+++ b/scripts/libpng-config-body.in
@@ -0,0 +1,65 @@
+
+usage()
+{
+    cat <<EOF
+Usage: libpng-config [OPTION] ...
+
+Known values for OPTION are:
+
+  --prefix              print libpng prefix
+  --libs                print library linking information
+  --cflags              print compiler flags
+  --cppflags            print pre-processor flags
+  --ldflags             print loader flags
+  --help                display this help and exit
+  --version             output version information
+EOF
+
+    exit $1
+}
+
+if test $# -eq 0; then
+    usage 1
+fi
+
+while test $# -gt 0; do
+    case "$1" in
+
+    --prefix)
+        echo ${prefix}
+        ;;
+
+    --version)
+        echo ${version}
+        exit 0
+        ;;
+
+    --help)
+        usage 0
+        ;;
+
+    --cflags)
+        echo ${cflags}
+        ;;
+
+    --cppflags)
+        echo ${cppflags}
+        ;;
+
+    --libs)
+        echo ${libs}
+        ;;
+
+    --ldflags)
+        echo ${ldflags}
+        ;;
+
+    *)
+        usage
+        exit 1
+        ;;
+    esac
+    shift
+done
+
+exit 0
--- a/scripts/libpng-config-head.in
+++ b/scripts/libpng-config-head.in
@@ -0,0 +1,17 @@
+#! /bin/sh
+
+# libpng-config
+# provides configuration info for libpng.
+
+# Copyright (C) 2002 Glenn Randers-Pehrson
+# For conditions of distribution and use, see copyright notice in png.h
+
+# Modeled after libxml-config.
+
+version=1.2.3rc5
+prefix=""
+cppflags=""
+cflags=""
+ldflags=""
+libs=""
+
--- a/scripts/libpng-config.in
+++ b/scripts/libpng-config.in
@@ -0,0 +1,88 @@
+#! /bin/sh
+
+# libpng-config
+# provides configuration info for libpng.
+
+# Copyright (C) 2002 Glenn Randers-Pehrson
+# For conditions of distribution and use, see copyright notice in png.h
+
+# Modeled after libxml-config, fixed to handle --prefix properly.
+
+prefix=@PREFIX@
+exec_prefix=${prefix}
+includedir=${prefix}/include
+
+usage()
+{
+    cat <<EOF
+Usage: libpng-config [OPTION] ...
+
+Known values for OPTION are:
+
+  --prefix=DIR          change libpng prefix [default $prefix]
+  --libs                print library linking information
+  --cflags              print compiler flags
+  --cppflags            print pre-processor flags
+  --ldflags             print loader flags
+  --help                display this help and exit
+  --version             output version information
+EOF
+
+    exit $1
+}
+
+if test $# -eq 0; then
+    usage 1
+fi
+
+while test $# -gt 0; do
+    case "$1" in
+    -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+    *) optarg= ;;
+    esac
+
+    case "$1" in
+    --prefix=*)
+        prefix=$optarg
+        exec_prefix=${prefix}
+        includedir=${prefix}/include
+        ;;
+
+    --prefix)
+        echo $prefix
+        ;;
+
+    --version)
+        echo 1.2.3rc5
+        exit 0
+        ;;
+
+    --help)
+        usage 0
+        ;;
+
+    --cflags)
+        echo #CFLAGS
+        ;;
+
+    --cppflags)
+        echo -I${includedir}/libpng12 #CPPFLAGS
+        ;;
+
+    --libs)
+        echo -lpng12 -lz #LIBS
+        ;;
+
+    --ldflags)
+        echo -L${exec_prefix}/lib #LDFLAGS
+        ;;
+
+    *)
+        usage
+        exit 1
+        ;;
+    esac
+    shift
+done
+
+exit 0
--- a/scripts/libpng.pc.in
+++ b/scripts/libpng.pc.in
@@ -6,6 +6,6 @@ includedir=${exec_prefix}/include

 Name: libpng12
 Description: Loads and saves PNG files
-Version: 1.2.3rc4
-Libs: -L${libdir} -lpng12
+Version: 1.2.3rc5
+Libs: -L${libdir} -lpng12 -lz -lm
 Cflags: -I${includedir}/libpng12
--- a/scripts/makefile.32sunu
+++ b/scripts/makefile.32sunu
@@ -33,7 +33,7 @@ RANLIB=echo

 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.3rc4
+PNGMIN = 1.2.3rc5
 PNGVER = $(PNGMAJ).$(PNGMIN)

 INCPATH=$(prefix)/include
@@ -62,7 +62,7 @@ OBJSDLL = $(OBJS:.o=.pic.o)
 .c.pic.o:
 	$(CC) -c $(CFLAGS) -KPIC -o $@ $*.c

-all: libpng.a $(LIBNAME).so pngtest libpng.pc
+all: libpng.a $(LIBNAME).so pngtest

 libpng.a: $(OBJS)
 	ar rc $@ $(OBJS)
@@ -71,6 +71,16 @@ libpng.a: $(OBJS)
 libpng.pc:
 	cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc

+libpng-config:
+	( cat scripts/libpng-config-head.in; \
+	echo prefix=\"$(prefix)\"; \
+	echo cppflags=\"-I$(INCPATH)/libpng12"; \
+	echo cflags=\"-xtarget=ultra\"; \
+	echo ldflags=\"-xtarget=ultra -L$(LIBPATH) -R$(LIBPATH)\"; \
+	echo libs=\"-lpng12 -lz -lm\"; \
+	cat scripts/libpng-config-body.in ) > libpng-config
+	chmod +x libpng-config
+
 $(LIBNAME).so: $(LIBNAME).so.$(PNGMAJ)
 	ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so

@@ -154,12 +164,12 @@ install-man: libpng.3 libpngpf.3 png.5
 	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man5/png.5
 	cp png.5 $(DESTDIR)$(MANPATH)/man5

-install-config: scripts/libpng-config
+install-config: libpng-config
 	-@if [ ! -d $(DESTDIR)$(BINPATH) ]; then \
 	mkdir $(DESTDIR)$(BINPATH); fi
 	-@/bin/rm -f $(DESTDIR)$(BINPATH)/libpng-config
 	-@/bin/rm -f $(DESTDIR)$(BINPATH)/libpng12-config
-	cp scripts/libpng-config $(DESTDIR)$(BINPATH)/libpng12-config
+	cp libpng-config $(DESTDIR)$(BINPATH)/libpng12-config
 	chmod 755 $(DESTDIR)$(BINPATH)/libpng12-config
 	(cd $(DESTDIR)$(BINPATH); ln -sf libpng12-config libpng-config)

--- a/scripts/makefile.64sunu
+++ b/scripts/makefile.64sunu
@@ -33,7 +33,7 @@ RANLIB=echo

 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.3rc4
+PNGMIN = 1.2.3rc5
 PNGVER = $(PNGMAJ).$(PNGMIN)

 INCPATH=$(prefix)/include
@@ -62,7 +62,7 @@ OBJSDLL = $(OBJS:.o=.pic.o)
 .c.pic.o:
 	$(CC) -c $(CFLAGS) -KPIC -o $@ $*.c

-all: libpng.a $(LIBNAME).so pngtest libpng.pc
+all: libpng.a $(LIBNAME).so pngtest

 libpng.a: $(OBJS)
 	ar rc $@ $(OBJS)
@@ -71,6 +71,16 @@ libpng.a: $(OBJS)
 libpng.pc:
 	cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc

+libpng-config:
+	( cat scripts/libpng-config-head.in; \
+	echo prefix=\"$(prefix)\"; \
+	echo cppflags=\"-I$(INCPATH)/libpng12"; \
+	echo cflags=\"-xtarget=ultra -xarch=v9\"; \
+	echo ldflags=\"-xtarget=ultra -xarch=v9 -L$(LIBPATH) -R$(LIBPATH)\"; \
+	echo libs=\"-lpng12 -lz -lm\"; \
+	cat scripts/libpng-config-body.in ) > libpng-config
+	chmod +x libpng-config
+
 $(LIBNAME).so: $(LIBNAME).so.$(PNGMAJ)
 	ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so

@@ -135,11 +145,11 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc
 	ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
 	-@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \
 	mkdir $(DESTDIR)$(LIBPATH)/pkgconfig; fi
-	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
+	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/$(LIBNAME).pc
 	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.pc
-	cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
-	chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
-	(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -f -s libpng12.pc libpng.pc)
+	cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/$(LIBNAME).pc
+	chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/$(LIBNAME).pc
+	(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -f -s $(LIBNAME).pc libpng.pc)

 install-man: libpng.3 libpngpf.3 png.5
 	-@if [ ! -d $(DESTDIR)$(MANPATH) ]; then mkdir $(DESTDIR)$(MANPATH); fi
@@ -154,14 +164,14 @@ install-man: libpng.3 libpngpf.3 png.5
 	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man5/png.5
 	cp png.5 $(DESTDIR)$(MANPATH)/man5

-install-config: scripts/libpng-config
+install-config: libpng-config
 	-@if [ ! -d $(DESTDIR)$(BINPATH) ]; then \
 	mkdir $(DESTDIR)$(BINPATH); fi
 	-@/bin/rm -f $(DESTDIR)$(BINPATH)/libpng-config
-	-@/bin/rm -f $(DESTDIR)$(BINPATH)/libpng12-config
-	cp scripts/libpng-config $(DESTDIR)$(BINPATH)/libpng12-config
-	chmod 755 $(DESTDIR)$(BINPATH)/libpng12-config
-	(cd $(DESTDIR)$(BINPATH); ln -sf libpng12-config libpng-config)
+	-@/bin/rm -f $(DESTDIR)$(BINPATH)/$(LIBNAME)-config
+	cp libpng-config $(DESTDIR)$(BINPATH)/$(LIBNAME)-config
+	chmod 755 $(DESTDIR)$(BINPATH)/$(LIBNAME)-config
+	(cd $(DESTDIR)$(BINPATH); ln -sf $(LIBNAME)-config libpng-config)

 install: install-static install-shared install-man install-config

--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -14,7 +14,7 @@ ZLIBINC=/usr/local/include
 # read libpng.txt or png.h to see why PNGMAJ is 0.  You should not
 # have to change it.
 PNGMAJ = 0
-PNGMIN = 1.2.3rc4
+PNGMIN = 1.2.3rc5
 PNGVER = $(PNGMAJ).$(PNGMIN)

 ALIGN=
@@ -62,7 +62,7 @@ OBJSDLL = $(OBJS)

 .SUFFIXES:      .c .o

-all: libpng.a $(LIBNAME).so pngtest libpng.pc
+all: libpng.a $(LIBNAME).so pngtest

 libpng.a: $(OBJS)
 	ar rc $@ $(OBJS)
@@ -71,6 +71,16 @@ libpng.a: $(OBJS)
 libpng.pc:
 	cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc

+libpng-config:
+	( cat scripts/libpng-config-head.in; \
+	echo prefix=\"$(prefix)\"; \
+	echo cppflags=\"-I$(INCPATH)/libpng12"; \
+	echo cflags=\"\"; \
+	echo ldflags=\"-Wl,-soname=$(LIBNAME).so.$(PNGMAJ)"; \
+	echo libs=\"-lpng12 -lz -lm\"; \
+	cat scripts/libpng-config-body.in ) > libpng-config
+	chmod +x libpng-config
+
 $(LIBNAME).so: $(LIBNAME).so.$(PNGMAJ)
 	ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so
 	cp $(LIBNAME).so* /boot/home/config/lib
@@ -124,11 +134,11 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc
 	ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
 	-@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \
 	mkdir $(DESTDIR)$(LIBPATH)/pkgconfig; fi
-	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
+	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/$(LIBNAME).pc
 	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.pc
-	cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
-	chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
-	(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf libpng12.pc libpng.pc)
+	cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/$(LIBNAME).pc
+	chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/$(LIBNAME).pc
+	(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf $(LIBNAME).pc libpng.pc)

 install-man: libpng.3 libpngpf.3 png.5
 	-@if [ ! -d $(DESTDIR)$(MANPATH) ]; then mkdir $(DESTDIR)$(MANPATH); fi
@@ -143,14 +153,14 @@ install-man: libpng.3 libpngpf.3 png.5
 	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man5/png.5
 	cp png.5 $(DESTDIR)$(MANPATH)/man5

-install-config: scripts/libpng-config
+install-config: libpng-config
 	-@if [ ! -d $(DESTDIR)$(BINPATH) ]; then \
 	mkdir $(DESTDIR)$(BINPATH); fi
 	-@/bin/rm -f $(DESTDIR)$(BINPATH)/libpng-config
-	-@/bin/rm -f $(DESTDIR)$(BINPATH)/libpng12-config
-	cp scripts/libpng-config $(DESTDIR)$(BINPATH)/libpng12-config
-	chmod 755 $(DESTDIR)$(BINPATH)/libpng12-config
-	(cd $(DESTDIR)$(BINPATH); ln -sf libpng12-config libpng-config)
+	-@/bin/rm -f $(DESTDIR)$(BINPATH)/$(LIBNAME)-config
+	cp libpng-config $(DESTDIR)$(BINPATH)/$(LIBNAME)-config
+	chmod 755 $(DESTDIR)$(BINPATH)/$(LIBNAME)-config
+	(cd $(DESTDIR)$(BINPATH); ln -sf $(LIBNAME)-config libpng-config)

 install: install-static install-shared install-man install-config

--- a/scripts/makefile.cygwin
+++ b/scripts/makefile.cygwin
@@ -8,6 +8,17 @@
 # Copyright (C) 1996, 1997 Andreas Dilger
 # For conditions of distribution and use, see copyright notice in png.h

+# this makefile intends to support building outside the src directory
+# if desired. when invoking it, specify an argument to SRC on the
+# command line that points to the top of the directory where your source
+# is located.
+
+ifdef SRC
+VPATH = $(SRC)
+else
+SRC = .
+endif
+
 # override DESTDIR= on the make install command line to easily support
 # installing into a temporary location.  Example:
 #
@@ -16,10 +27,12 @@
 # If you're going to install into a temporary location
 # via DESTDIR, that location must already exist before
 # you execute make install.
+
 DESTDIR=

 # To enable assembler optimizations, add '-DPNG_USE_PNGGCCRD' to
-# $CFLAGS, and include pnggccrd.o in $OBJS, below.
+# $CFLAGS, and include pnggccrd.o in $OBJS, below, and in the dependency
+# list at the bottom of this file.

 CC=gcc
 ifdef MINGW
@@ -28,11 +41,14 @@ MINGW_LDFLAGS=-mno-cygwin -L/usr/lib/mingw
 endif

 # where "make install" puts libpng.a, libpng.so*, png.h, and pngconf.h
+ifndef prefix
 prefix=/usr
+$(warning You haven't specified a 'prefix=' location. Defaulting to "/usr")
+endif

 # Where the zlib library and include files are located
-ZLIBLIB=$(DESTDIR)$(LIBPATH)
-ZLIBINC=$(DESTDIR)$(INCPATH)
+ZLIBLIB=/lib#$(DESTDIR)$(LIBPATH)
+ZLIBINC=#$(DESTDIR)$(INCPATH)
 #ZLIBLIB=../zlib
 #ZLIBINC=../zlib

@@ -44,15 +60,25 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
 	-Wmissing-declarations -Wtraditional -Wcast-align \
 	-Wstrict-prototypes -Wmissing-prototypes #-Wconversion

-#CFLAGS=-DPNG_USE_PNGGCCRD -I$(ZLIBINC) -Wall -O3 $(ALIGN) -funroll-loops \
-#        -fomit-frame-pointer  # $(WARNMORE) -g -DPNG_DEBUG=5
-CFLAGS=$(MINGW_CCFLAGS) -I$(ZLIBINC) -Wall -O3 $(ALIGN) -funroll-loops \
-	-fomit-frame-pointer
+### if you use the asm, add pnggccrd.o to the OBJS list
+###
+### if you don't need thread safety, but want the asm accel
+#CFLAGS= $(strip $(MINGW_CCFLAGS) -DPNG_THREAD_UNSAFE_OK -DPNG_USE_PNGGCCRD \
+#	$(addprefix -I,$(ZLIBINC)) -Wall -O3 $(ALIGN) -funroll-loops \
+#	-fomit-frame-pointer)  # $(WARNMORE) -g -DPNG_DEBUG=5
+### if you need thread safety and want (minimal) asm accel
+#CFLAGS= $(strip $(MINGW_CCFLAGS) -DPNG_USE_PNGGCCRD $(addprefix -I,$(ZLIBINC)) \
+#	-Wall -O3 $(ALIGN) -funroll-loops \
+#	-fomit-frame-pointer)  # $(WARNMORE) -g -DPNG_DEBUG=5
+### Normal (non-asm) compilation
+CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
+        -Wall -O3 $(ALIGN) -funroll-loops \
+	-fomit-frame-pointer) # $(WARNMORE) -g -DPNG_DEBUG=5

-LIBNAME=libpng12
+LIBNAME = libpng12
 PNGMAJ = 0
 PNGDLL = 12
-PNGMIN = 1.2.3rc4
+PNGMIN = 1.2.3rc5
 PNGVER = $(PNGMAJ).$(PNGMIN)

 SHAREDLIB=cygpng$(PNGDLL).dll
@@ -62,10 +88,11 @@ SHAREDDEF=libpng.def
 LIBS=$(SHAREDLIB) $(STATLIB)
 EXE=.exe

-LDFLAGS=-L. $(MINGW_LDFLAGS) -L$(ZLIBLIB) -lpng -lz
-LDSFLAGS=-shared -L.  $(MINGW_LDFLAGS) -Wl,--export-all
+LDFLAGS=$(strip -L. $(MINGW_LDFLAGS) $(addprefix -L,$(ZLIBLIB)) -lpng -lz)
+LDSFLAGS=$(strip -shared -L.  $(MINGW_LDFLAGS) -Wl,--export-all)
 LDEXTRA=-Wl,--out-implib=$(IMPLIB)

+MKDIR=/bin/mkdir -pv
 RANLIB=ranlib
 #RANLIB=echo

@@ -74,8 +101,8 @@ LIBPATH=$(prefix)/lib

 BINPATH=$(prefix)/bin
 MANPATH=$(prefix)/man
-MAN3PATH=$(DESTDIR)$(MANPATH)/man3
-MAN5PATH=$(DESTDIR)$(MANPATH)/man5
+MAN3PATH=$(MANPATH)/man3
+MAN5PATH=$(MANPATH)/man5

 OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
 	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
@@ -83,40 +110,64 @@ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \

 OBJSDLL = $(OBJS:.o=.pic.o)

-.SUFFIXES:      .c .o .pic.o
+.SUFFIXES: .c .o .pic.o

 %.o : %.c
 	$(CC) -c $(CFLAGS) -o $@ $<
-
+%.pic.o : CFLAGS += -DPNG_BUILD_DLL
 %.pic.o : %.c
-	$(CC) -c $(CFLAGS) -DPNG_BUILD_DLL -o $@ $<
+	$(CC) -c $(CFLAGS) -o $@ $<

-all: all-static all-shared libpng.pc
+all: all-static all-shared libpng.pc libpng-config
+
+# make this to verify that "make [...] install" will do what you want.
+buildsetup-tell:
+	@echo  VPATH is set to: \"$(VPATH)\"
+	@echo  prefix is set to: \"$(prefix)\"
+	@echo -e INCPATH,LIBPATH, etc. are set to:'\n' \
+ $(addprefix $(DESTDIR),$(INCPATH)'\n' $(LIBPATH)'\n' $(BINPATH)'\n' \
+   $(MANPATH)'\n' $(MAN3PATH)'\n' $(MAN5PATH)'\n')'\n'

 libpng.pc: scripts/libpng.pc.in
-	cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc
+	@echo -e Making pkg-config file for this libpng installation..'\n' \
+           using PREFIX=\"$(prefix)\"'\n'
+	cat $(SRC)/scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! | \
+	   sed -e s/-lm// > libpng.pc
+
+libpng-config: scripts/libpng-config.in
+	@echo -e Making libpng-config file for this libpng installation..'\n' \
+           using PREFIX=\"$(prefix)\"'\n'
+	( cat $(SRC)/scripts/libpng-config-head.in; \
+	echo prefix=\"$(prefix)\"; \
+	echo cppflags=\"-I$(INCPATH)/libpng12"; \
+	echo cflags=\"\"; \
+	echo ldflags=\"-L$(LIBPATH)"; \
+	echo libs=\"-lpng12 -lz\"; \
+	cat $(SRC)/scripts/libpng-config-body.in ) > libpng-config
+	chmod +x libpng-config

 static: all-static
-
 shared: all-shared
-
 all-static: $(STATLIB) pngtest-stat$(EXE)
-
 all-shared: $(SHAREDLIB) pngtest$(EXE)

-pnggccrd.o:	png.h pngconf.h
+pnggccrd.o: pnggccrd.c png.h pngconf.h
 	@echo ""
-	@echo '    You can ignore the single "control reaches end of non-void function"'
-	@echo '    warning and multiple "<variable> defined but not used" warnings:'
+	@echo \
+	'    You can ignore the single "control reaches end of non-void function"'
+	@echo \
+	'    warning and multiple "<variable> defined but not used" warnings:'
 	@echo ""
-	$(CC) -c $(CFLAGS) -o $@ $*.c
+	$(CC) -c $(CFLAGS) -o $@ $<

-pnggccrd.pic.o:	png.h pngconf.h
+pnggccrd.pic.o:	pnggccrd.c png.h pngconf.h
 	@echo ""
-	@echo '    You can ignore the single "control reaches end of non-void function"'
-	@echo '    warning and multiple "<variable> defined but not used" warnings:'
+	@echo \
+	'    You can ignore the single "control reaches end of non-void function"'
+	@echo \
+	'    warning and multiple "<variable> defined but not used" warnings:'
 	@echo ""
-	$(CC) -c $(CFLAGS) -DPNG_BUILD_DLL -o $@ pnggccrd.c
+	$(CC) -c $(CFLAGS) -DPNG_BUILD_DLL -o $@ $<

 $(STATLIB): $(OBJS)
 	ar rc $@ $(OBJS)
@@ -144,58 +195,70 @@ pngtest.o: pngtest.c
 test: test-static test-shared

 test-static: pngtest-stat$(EXE)
-	./pngtest-stat
+	./pngtest-stat $(SRC)/pngtest.png

 test-shared: pngtest$(EXE)
-	./pngtest
+	./pngtest $(SRC)/pngtest.png

 install-static: $(STATLIB) install-headers install-man
-	-@if [ ! -d $(DESTDIR)$(LIBPATH) ]; then mkdir -p $(DESTDIR)$(LIBPATH); fi
+	-@if [ ! -d $(DESTDIR)$(LIBPATH) ]; then $(MKDIR) $(DESTDIR)$(LIBPATH); fi
 	install -m 644 $(STATLIB) $(DESTDIR)$(LIBPATH)/$(LIBNAME).a
 	-@rm -f $(DESTDIR)$(LIBPATH)/$(STATLIB)
 	(cd $(DESTDIR)$(LIBPATH); ln -sf $(LIBNAME).a $(STATLIB))

-install-shared: $(SHAREDLIB) libpng.pc install-headers install-man
-	-@if [ ! -d $(DESTDIR)$(LIBPATH) ]; then mkdir -p $(DESTDIR)$(LIBPATH); fi
-	-@if [ ! -d $(DESTDIR)$(BINPATH) ]; then mkdir -p $(DESTDIR)$(BINPATH); fi
+install-shared: $(SHAREDLIB) libpng.pc libpng-config install-headers install-man
+	-@if [ ! -d $(DESTDIR)$(LIBPATH) ]; then $(MKDIR) $(DESTDIR)$(LIBPATH); fi
+	-@if [ ! -d $(DESTDIR)$(BINPATH) ]; then $(MKDIR) $(DESTDIR)$(BINPATH); fi
 	-@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \
-	mkdir -p $(DESTDIR)$(LIBPATH)/pkgconfig; fi
-	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
+           $(MKDIR) $(DESTDIR)$(LIBPATH)/pkgconfig; fi
+	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/$(LIBNAME).pc
 	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.pc
 	install -m 644 $(IMPLIB) $(DESTDIR)$(LIBPATH)/$(LIBNAME).dll.a
 	-@rm -f $(DESTDIR)$(LIBPATH)/$(IMPLIB)
 	(cd $(DESTDIR)$(LIBPATH); ln -sf $(LIBNAME).dll.a $(IMPLIB))
 	install -s -m 755 $(SHAREDLIB) $(DESTDIR)$(BINPATH)
 	install -m 644 libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/$(LIBNAME).pc
-	(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf libpng12.pc libpng.pc)
+	(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf $(LIBNAME).pc libpng.pc)

 install-headers:
 	-@if [ ! -d $(DESTDIR)$(INCPATH) ]; then \
-	mkdir -p $(DESTDIR)$(INCPATH); fi
+          $(MKDIR) $(DESTDIR)$(INCPATH); fi
 	-@if [ ! -d $(DESTDIR)$(INCPATH)/$(LIBNAME) ]; then \
-	mkdir -p $(DESTDIR)$(INCPATH)/$(LIBNAME); fi
+          $(MKDIR) $(DESTDIR)$(INCPATH)/$(LIBNAME); fi
 	-@rm -f $(DESTDIR)$(INCPATH)/png.h
 	-@rm -f $(DESTDIR)$(INCPATH)/pngconf.h
-	install -m 644 png.h pngconf.h $(DESTDIR)$(INCPATH)/$(LIBNAME)
+	install -m 644 $(SRC)/png.h $(SRC)/pngconf.h $(DESTDIR)$(INCPATH)/$(LIBNAME)
 	-@rm -f $(DESTDIR)$(INCPATH)/libpng
 	(cd $(DESTDIR)$(INCPATH); ln -sf $(LIBNAME) libpng; ln -sf $(LIBNAME)/* .)

 install-man:
 	-@if [ ! -d $(DESTDIR)$(MAN3PATH) ]; then \
-	mkdir -p $(DESTDIR)$(MAN3PATH); fi
+          $(MKDIR) $(DESTDIR)$(MAN3PATH); fi
 	-@if [ ! -d $(DESTDIR)$(MAN5PATH) ]; then \
-	mkdir -p $(DESTDIR)$(MAN5PATH); fi
-	install -m 644 libpngpf.3 libpng.3 $(DESTDIR)$(MAN3PATH)
-	install -m 644 png.5 $(DESTDIR)$(MAN5PATH)
+          $(MKDIR) $(DESTDIR)$(MAN5PATH); fi
+	install -m 644 $(SRC)/libpngpf.3 $(SRC)/libpng.3 $(DESTDIR)$(MAN3PATH)
+	install -m 644 $(SRC)/png.5 $(DESTDIR)$(MAN5PATH)

-install-config: scripts/libpng-config
+install-config: libpng-config
 	-@if [ ! -d $(DESTDIR)$(BINPATH) ]; then \
-	mkdir $(DESTDIR)$(BINPATH); fi
+           mkdir $(DESTDIR)$(BINPATH); fi
 	-@/bin/rm -f $(DESTDIR)$(BINPATH)/libpng-config
-	-@/bin/rm -f $(DESTDIR)$(BINPATH)/libpng12-config
-	cp scripts/libpng-config $(DESTDIR)$(BINPATH)/libpng12-config
-	chmod 755 $(DESTDIR)$(BINPATH)/libpng12-config
-	(cd $(DESTDIR)$(BINPATH); ln -sf libpng12-config libpng-config)
+	-@/bin/rm -f $(DESTDIR)$(BINPATH)/$(LIBNAME)-config
+	cp libpng-config $(DESTDIR)$(BINPATH)/$(LIBNAME)-config
+	chmod 755 $(DESTDIR)$(BINPATH)/$(LIBNAME)-config
+	(cd $(DESTDIR)$(BINPATH); ln -sf $(LIBNAME)-config libpng-config)
+
+# run this to verify that a future `configure' run will pick up the settings you want.
+test-config-install: SHELL=/bin/bash
+test-config-install: $(DESTDIR)$(BINPATH)/$(LIBNAME)-config
+	@echo -e Testing libpng-config functions...'\n'
+	@ for TYRA in LDFLAGS CPPFLAGS CFLAGS LIBS VERSION; \
+   do \
+    printf "(%d)\t %s = %s\n" $$(($$gytiu + 1)) $$TYRA \
+    $$(libpng-config `echo "--$$TYRA" |tr '[:upper:]' '[:lower:]'`); \
+    gytiu=$$(( $$gytiu + 1 )); \
+   done
+

 install: install-static install-shared install-man install-config

@@ -207,6 +270,8 @@ DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
 writelock:
 	chmod a-w *.[ch35] $(DOCS) scripts/*

+.PHONY: buildsetup-tell libpng.pc libpng-config test-config-install clean
+
 # DO NOT DELETE THIS LINE -- make depend depends on it.

 png.o png.pic.o:		png.h pngconf.h png.c
@@ -227,3 +292,6 @@ pngpread.o pngpread.pic.o:	png.h pngconf.h pngpread.c

 pngtest.o:			png.h pngconf.h pngtest.c
 pngtest-stat.o:			png.h pngconf.h pngtest.c
+
+
+
--- a/scripts/makefile.darwin
+++ b/scripts/makefile.darwin
@@ -25,7 +25,7 @@ RANLIB=ranlib
 # read libpng.txt or png.h to see why PNGMAJ is 0.  You should not
 # have to change it.
 PNGMAJ = 0
-PNGMIN = 1.2.3rc4
+PNGMIN = 1.2.3rc5
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12

@@ -55,14 +55,25 @@ OBJSDLL = $(OBJS:.o=.pic.o)
 .c.pic.o:
 	$(CC) -c $(CFLAGS) -fno-common -o $@ $*.c

-all: libpng.a $(LIBNAME).dylib pngtest libpng.pc
+all: libpng.a $(LIBNAME).dylib pngtest

 libpng.a: $(OBJS)
 	ar rc $@ $(OBJS)
 	$(RANLIB) $@

 libpng.pc:
-	cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc
+	cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! | \
+	   sed -e s/-lm// > libpng.pc
+
+libpng-config:
+	( cat scripts/libpng-config-head.in; \
+	echo prefix=\"$(prefix)\"; \
+	echo cppflags=\"-I$(INCPATH)/libpng12"; \
+	echo cflags=\"\"; \
+	echo ldflags=\"-L$(LIBPATH)\"; \
+	echo libs=\"-lpng12 -lz\"; \
+	cat scripts/libpng-config-body.in ) > libpng-config
+	chmod +x libpng-config

 $(LIBNAME).dylib: $(LIBNAME).$(PNGMAJ).dylib
 	ln -sf $(LIBNAME).$(PNGMAJ).dylib $(LIBNAME).dylib
@@ -85,9 +96,11 @@ test: pngtest

 install-headers: png.h pngconf.h
 	-@if [ ! -d $(DESTDIR)$(INCPATH) ]; then mkdir $(DESTDIR)$(INCPATH); fi
-	-@if [ ! -d $(DESTDIR)$(INCPATH)/$(LIBNAME) ]; then mkdir $(DESTDIR)$(INCPATH)/$(LIBNAME); fi
+	-@if [ ! -d $(DESTDIR)$(INCPATH)/$(LIBNAME) ]; then \
+	mkdir $(DESTDIR)$(INCPATH)/$(LIBNAME); fi
 	cp png.h pngconf.h $(DESTDIR)$(INCPATH)/$(LIBNAME)
-	chmod 644 $(DESTDIR)$(INCPATH)/$(LIBNAME)/png.h $(DESTDIR)$(INCPATH)/$(LIBNAME)/pngconf.h
+	chmod 644 $(DESTDIR)$(INCPATH)/$(LIBNAME)/png.h \
+	$(DESTDIR)$(INCPATH)/$(LIBNAME)/pngconf.h
 	-@/bin/rm -f $(DESTDIR)$(INCPATH)/png.h $(DESTDIR)$(INCPATH)/pngconf.h
 	-@/bin/rm -f $(DESTDIR)$(INCPATH)/libpng
 	(cd $(DESTDIR)$(INCPATH); ln -sf $(LIBNAME) libpng; ln -sf $(LIBNAME)/* .)
@@ -116,11 +129,11 @@ install-shared: install-headers $(LIBNAME).dylib libpng.pc
 	ln -sf $(LIBNAME).$(PNGMAJ).dylib $(LIBNAME).dylib)
 	-@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \
 	mkdir $(DESTDIR)$(LIBPATH)/pkgconfig; fi
-	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
+	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/$(LIBNAME).pc
 	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.pc
-	cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
-	chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
-	(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf libpng12.pc libpng.pc)
+	cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/$(LIBNAME).pc
+	chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/$(LIBNAME).pc
+	(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf $(LIBNAME).pc libpng.pc)

 install-man: libpng.3 libpngpf.3 png.5
 	-@if [ ! -d $(DESTDIR)$(MANPATH) ]; then mkdir $(DESTDIR)$(MANPATH); fi
@@ -135,14 +148,14 @@ install-man: libpng.3 libpngpf.3 png.5
 	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man5/png.5
 	cp png.5 $(DESTDIR)$(MANPATH)/man5

-install-config: scripts/libpng-config
+install-config: libpng-config
 	-@if [ ! -d $(DESTDIR)$(BINPATH) ]; then \
 	mkdir $(DESTDIR)$(BINPATH); fi
 	-@/bin/rm -f $(DESTDIR)$(BINPATH)/libpng-config
-	-@/bin/rm -f $(DESTDIR)$(BINPATH)/libpng12-config
-	cp scripts/libpng-config $(DESTDIR)$(BINPATH)/libpng12-config
-	chmod 755 $(DESTDIR)$(BINPATH)/libpng12-config
-	(cd $(DESTDIR)$(BINPATH); ln -sf libpng12-config libpng-config)
+	-@/bin/rm -f $(DESTDIR)$(BINPATH)/$(LIBNAME)-config
+	cp libpng-config $(DESTDIR)$(BINPATH)/$(LIBNAME)-config
+	chmod 755 $(DESTDIR)$(BINPATH)/$(LIBNAME)-config
+	(cd $(DESTDIR)$(BINPATH); ln -sf $(LIBNAME)-config libpng-config)

 install: install-static install-shared install-man install-config

--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -29,7 +29,7 @@ ZLIBINC=../zlib
 # read libpng.txt or png.h to see why PNGMAJ is 0.  You should not
 # have to change it.
 PNGMAJ = 0
-PNGMIN = 1.2.3rc4
+PNGMIN = 1.2.3rc5
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12

@@ -44,7 +44,7 @@ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
 	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
 	pngwtran.o pngmem.o pngerror.o pngpread.o

-all: $(LIBNAME).so libpng.a pngtest libpng.pc
+all: $(LIBNAME).so libpng.a pngtest

 libpng.a: $(OBJS)
 	ar rc $@  $(OBJS)
@@ -53,6 +53,20 @@ libpng.a: $(OBJS)
 libpng.pc:
 	cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc

+libpng-config:
+	( cat scripts/libpng-config-head.in; \
+	echo prefix=\"$(prefix)\"; \
+	echo cppflags=\"-I$(INCPATH)/libpng12"; \
+	echo cflags=\"-std\"; \
+	echo ldflags=\"-L$(LIBPATH)\"; \
+	echo libs=\"-lpng12 -lz -lm\"; \
+	cat scripts/libpng-config-body.in ) > libpng-config
+	chmod +x libpng-config
+
+	cat scripts/libpng-config.in | sed -e s\!@PREFIX@!$(prefix)! > \
+	  -e s!\#LIBS!-lm! > libpng-config
+	chmod +x libpng-config
+
 $(LIBNAME).so: $(LIBNAME).so.$(PNGMAJ)
 	ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so

@@ -103,11 +117,11 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc
 	ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
 	-@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \
 	mkdir $(DESTDIR)$(LIBPATH)/pkgconfig; fi
-	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
+	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/$(LIBNAME).pc
 	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.pc
-	cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
-	chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
-	(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf libpng12.pc libpng.pc)
+	cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/$(LIBNAME).pc
+	chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/$(LIBNAME).pc
+	(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf $(LIBNAME).pc libpng.pc)

 install-man: libpng.3 libpngpf.3 png.5
 	-@if [ ! -d $(DESTDIR)$(MANPATH) ]; then mkdir $(DESTDIR)$(MANPATH); fi
@@ -122,14 +136,14 @@ install-man: libpng.3 libpngpf.3 png.5
 	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man5/png.5
 	cp png.5 $(DESTDIR)$(MANPATH)/man5

-install-config: scripts/libpng-config
+install-config: libpng-config
 	-@if [ ! -d $(DESTDIR)$(BINPATH) ]; then \
 	mkdir $(DESTDIR)$(BINPATH); fi
 	-@/bin/rm -f $(DESTDIR)$(BINPATH)/libpng-config
-	-@/bin/rm -f $(DESTDIR)$(BINPATH)/libpng12-config
-	cp scripts/libpng-config $(DESTDIR)$(BINPATH)/libpng12-config
-	chmod 755 $(DESTDIR)$(BINPATH)/libpng12-config
-	(cd $(DESTDIR)$(BINPATH); ln -sf libpng12-config libpng-config)
+	-@/bin/rm -f $(DESTDIR)$(BINPATH)/$(LIBNAME)-config
+	cp libpng-config $(DESTDIR)$(BINPATH)/$(LIBNAME)-config
+	chmod 755 $(DESTDIR)$(BINPATH)/$(LIBNAME)-config
+	(cd $(DESTDIR)$(BINPATH); ln -sf $(LIBNAME)-config libpng-config)

 install: install-static install-shared install-man install-config

--- a/scripts/makefile.gcmmx
+++ b/scripts/makefile.gcmmx
@@ -15,7 +15,7 @@

 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.3rc4
+PNGMIN = 1.2.3rc5
 PNGVER = $(PNGMAJ).$(PNGMIN)

 CC=gcc
@@ -86,11 +86,27 @@ OBJSDLL = $(OBJS:.o=.pic.o)
 .c.pic.o:
 	$(CC) -c $(CFLAGS) -fPIC -o $@ $*.c

-all: libpng.a $(LIBNAME).so pngtest pngtest-static libpng.pc
+all: libpng.a $(LIBNAME).so pngtest pngtest-static

 libpng.pc:
 	cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc

+libpng-config:
+	( cat scripts/libpng-config-head.in; \
+	echo prefix=\"$(prefix)\"; \
+	echo cppflags=\"-I$(INCPATH)/libpng12 -DPNG_THREAD_UNSAFE_OK \
+	   -DPNG_USE_PNGGCCRD"; \
+	echo cflags=\"\"; \
+	echo ldflags=\"\"; \
+	echo libs=\"-lpng12 -lz -lm\"; \
+	cat scripts/libpng-config-body.in ) > libpng-config
+	chmod +x libpng-config
+
+	cat scripts/libpng-config.in | sed -e s\!@PREFIX@!$(prefix)! > \
+	  -e s!\#CFLAGS!-DPNG_THREAD_UNSAFE_OK -DPNG_USE_PNGGCCRD! \
+	  -e s!\#LIBS!-lm! > libpng-config
+	chmod +x libpng-config
+
 pnggccrd.o:	pnggccrd.c png.h pngconf.h
 	$(CC) -c $(CFLAGS) -o $@ $*.c

@@ -119,7 +135,7 @@ pngtest-static: pngtest.o libpng.a

 test: pngtest pngtest-static
 	@echo ""
-	@echo "   Running pngtest dynamically linked with libpng12.so:"
+	@echo "   Running pngtest dynamically linked with $(LIBNAME).so:"
 	@echo ""
 	./pngtest
 	@echo ""
@@ -162,11 +178,11 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc
 	ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
 	-@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \
 	mkdir $(DESTDIR)$(LIBPATH)/pkgconfig; fi
-	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
+	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/$(LIBNAME).pc
 	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.pc
-	cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
-	chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
-	(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf libpng12.pc libpng.pc)
+	cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/$(LIBNAME).pc
+	chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/$(LIBNAME).pc
+	(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf $(LIBNAME).pc libpng.pc)

 install-man: libpng.3 libpngpf.3 png.5
 	-@if [ ! -d $(DESTDIR)$(MANPATH) ]; then mkdir $(DESTDIR)$(MANPATH); fi
@@ -181,14 +197,14 @@ install-man: libpng.3 libpngpf.3 png.5
 	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man5/png.5
 	cp png.5 $(DESTDIR)$(MANPATH)/man5

-install-config: scripts/libpng-config
+install-config: libpng-config
 	-@if [ ! -d $(DESTDIR)$(BINPATH) ]; then \
 	mkdir $(DESTDIR)$(BINPATH); fi
 	-@/bin/rm -f $(DESTDIR)$(BINPATH)/libpng-config
-	-@/bin/rm -f $(DESTDIR)$(BINPATH)/libpng12-config
-	cp scripts/libpng-config $(DESTDIR)$(BINPATH)/libpng12-config
-	chmod 755 $(DESTDIR)$(BINPATH)/libpng12-config
-	(cd $(DESTDIR)$(BINPATH); ln -sf libpng12-config libpng-config)
+	-@/bin/rm -f $(DESTDIR)$(BINPATH)/$(LIBNAME)-config
+	cp libpng-config $(DESTDIR)$(BINPATH)/$(LIBNAME)-config
+	chmod 755 $(DESTDIR)$(BINPATH)/$(LIBNAME)-config
+	(cd $(DESTDIR)$(BINPATH); ln -sf $(LIBNAME)-config libpng-config)

 install: install-static install-shared install-man install-config

--- a/scripts/makefile.hpgcc
+++ b/scripts/makefile.hpgcc
@@ -35,7 +35,7 @@ RANLIB=ranlib
 # read libpng.txt or png.h to see why PNGMAJ is 0.  You should not
 # have to change it.
 PNGMAJ = 0
-PNGMIN = 1.2.3rc4
+PNGMIN = 1.2.3rc5
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12

@@ -65,7 +65,7 @@ OBJSDLL = $(OBJS:.o=.pic.o)
 .c.pic.o:
 	$(CC) -c $(CFLAGS) -fPIC -o $@ $*.c

-all: libpng.a $(LIBNAME).sl pngtest libpng.pc
+all: libpng.a $(LIBNAME).sl pngtest

 libpng.a: $(OBJS)
 	ar rc $@ $(OBJS)
@@ -74,6 +74,16 @@ libpng.a: $(OBJS)
 libpng.pc:
 	cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc

+libpng-config:
+	( cat scripts/libpng-config-head.in; \
+	echo prefix=\"$(prefix)\"; \
+	echo cppflags=\"-I$(INCPATH)/libpng12"; \
+	echo cflags=\"\"; \
+	echo ldflags=\"\"; \
+	echo libs=\"-lpng12 -lz -lm\"; \
+	cat scripts/libpng-config-body.in ) > libpng-config
+	chmod +x libpng-config
+
 $(LIBNAME).sl: $(LIBNAME).sl.$(PNGMAJ)
 	ln -f -s $(LIBNAME).sl.$(PNGMAJ) $(LIBNAME).sl

@@ -127,11 +137,11 @@ install-shared: install-headers $(LIBNAME).sl.$(PNGVER) libpng.pc
 	ln -sf $(LIBNAME).sl.$(PNGMAJ) $(LIBNAME).sl)
 	-@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then mkdir \
 	$(DESTDIR)$(LIBPATH)/pkgconfig; fi
-	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
+	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/$(LIBNAME).pc
 	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.pc
-	cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
-	chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
-	(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf libpng12.pc libpng.pc)
+	cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/$(LIBNAME).pc
+	chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/$(LIBNAME).pc
+	(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf $(LIBNAME).pc libpng.pc)

 install-man: libpng.3 libpngpf.3 png.5
 	-@if [ ! -d $(DESTDIR)$(MANPATH) ]; then mkdir $(DESTDIR)$(MANPATH); fi
@@ -146,14 +156,14 @@ install-man: libpng.3 libpngpf.3 png.5
 	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man5/png.5
 	cp png.5 $(DESTDIR)$(MANPATH)/man5

-install-config: scripts/libpng-config
+install-config: libpng-config
 	-@if [ ! -d $(DESTDIR)$(BINPATH) ]; then \
 	mkdir $(DESTDIR)$(BINPATH); fi
 	-@/bin/rm -f $(DESTDIR)$(BINPATH)/libpng-config
-	-@/bin/rm -f $(DESTDIR)$(BINPATH)/libpng12-config
-	cp scripts/libpng-config $(DESTDIR)$(BINPATH)/libpng12-config
-	chmod 755 $(DESTDIR)$(BINPATH)/libpng12-config
-	(cd $(DESTDIR)$(BINPATH); ln -sf libpng12-config libpng-config)
+	-@/bin/rm -f $(DESTDIR)$(BINPATH)/$(LIBNAME)-config
+	cp libpng-config $(DESTDIR)$(BINPATH)/$(LIBNAME)-config
+	chmod 755 $(DESTDIR)$(BINPATH)/$(LIBNAME)-config
+	(cd $(DESTDIR)$(BINPATH); ln -sf $(LIBNAME)-config libpng-config)

 install: install-static install-shared install-man install-config

--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -19,7 +19,7 @@ RANLIB=ranlib
 # read libpng.txt or png.h to see why PNGMAJ is 0.  You should not
 # have to change it.
 PNGMAJ = 0
-PNGMIN = 1.2.3rc4
+PNGMIN = 1.2.3rc5
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12

@@ -51,7 +51,7 @@ OBJSDLL = $(OBJS:.o=.pic.o)
 .c.pic.o:
 	$(CC) -c $(CFLAGS) +z -o $@ $*.c

-all: libpng.a $(LIBNAME).sl pngtest libpng.pc
+all: libpng.a $(LIBNAME).sl pngtest

 libpng.a: $(OBJS)
 	ar rc $@  $(OBJS)
@@ -60,6 +60,16 @@ libpng.a: $(OBJS)
 libpng.pc:
 	cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc

+libpng-config:
+	( cat scripts/libpng-config-head.in; \
+	echo prefix=\"$(prefix)\"; \
+	echo cppflags=\"-I$(INCPATH)/libpng12"; \
+	echo cflags=\"-Ae +DA1.1 +DS2.0"; \
+	echo ldflags=\"-L$(LIBPATH)\"; \
+	echo libs=\"-lpng12 -lz -lm\"; \
+	cat scripts/libpng-config-body.in ) > libpng-config
+	chmod +x libpng-config
+
 $(LIBNAME).sl: $(LIBNAME).sl.$(PNGMAJ)
 	ln -sf $(LIBNAME).sl.$(PNGMAJ) $(LIBNAME).sl

@@ -112,11 +122,11 @@ install-shared: install-headers $(LIBNAME).sl.$(PNGVER) libpng.pc
 	ln -sf $(LIBNAME).sl.$(PNGMAJ) $(LIBNAME).sl)
 	-@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \
 	mkdir $(DESTDIR)$(LIBPATH)/pkgconfig; fi
-	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
+	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/$(LIBNAME).pc
 	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.pc
-	cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
-	chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
-	(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf libpng12.pc libpng.pc)
+	cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/$(LIBNAME).pc
+	chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/$(LIBNAME).pc
+	(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf $(LIBNAME).pc libpng.pc)

 install-man: libpng.3 libpngpf.3 png.5
 	-@if [ ! -d $(DESTDIR)$(MANPATH) ]; then mkdir $(DESTDIR)$(MANPATH); fi
@@ -131,14 +141,14 @@ install-man: libpng.3 libpngpf.3 png.5
 	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man5/png.5
 	cp png.5 $(DESTDIR)$(MANPATH)/man5

-install-config: scripts/libpng-config
+install-config: libpng-config
 	-@if [ ! -d $(DESTDIR)$(BINPATH) ]; then \
 	mkdir $(DESTDIR)$(BINPATH); fi
 	-@/bin/rm -f $(DESTDIR)$(BINPATH)/libpng-config
-	-@/bin/rm -f $(DESTDIR)$(BINPATH)/libpng12-config
-	cp scripts/libpng-config $(DESTDIR)$(BINPATH)/libpng12-config
-	chmod 755 $(DESTDIR)$(BINPATH)/libpng12-config
-	(cd $(DESTDIR)$(BINPATH); ln -sf libpng12-config libpng-config)
+	-@/bin/rm -f $(DESTDIR)$(BINPATH)/$(LIBNAME)-config
+	cp libpng-config $(DESTDIR)$(BINPATH)/$(LIBNAME)-config
+	chmod 755 $(DESTDIR)$(BINPATH)/$(LIBNAME)-config
+	(cd $(DESTDIR)$(BINPATH); ln -sf $(LIBNAME)-config libpng-config)

 install: install-static install-shared install-man install-config

--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -5,7 +5,7 @@

 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.3rc4
+PNGMIN = 1.2.3rc5
 PNGVER = $(PNGMAJ).$(PNGMIN)

 CC=gcc
@@ -65,7 +65,7 @@ OBJSDLL = $(OBJS:.o=.pic.o)
 .c.pic.o:
 	$(CC) -c $(CFLAGS) -fPIC -o $@ $*.c

-all: libpng.a $(LIBNAME).so pngtest libpng.pc
+all: libpng.a $(LIBNAME).so pngtest

 libpng.a: $(OBJS)
 	ar rc $@ $(OBJS)
@@ -74,6 +74,20 @@ libpng.a: $(OBJS)
 libpng.pc:
 	cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc

+libpng-config:
+	( cat scripts/libpng-config-head.in; \
+	echo prefix=\"$(prefix)\"; \
+	echo cppflags=\"-I$(INCPATH)/libpng12"; \
+	echo cflags=\"\"; \
+	echo ldflags=\"-L$(LIBPATH) -Wl,-rpath,$(LIBPATH)"; \
+	echo libs=\"-lpng12 -lz -lm\"; \
+	cat scripts/libpng-config-body.in ) > libpng-config
+	chmod +x libpng-config
+
+	cat scripts/libpng-config.in | sed -e s\!@PREFIX@!$(prefix)! > \
+	  -e s!\#LIBS!-lm! > libpng-config
+	chmod +x libpng-config
+
 $(LIBNAME).so: $(LIBNAME).so.$(PNGMAJ)
 	ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so

@@ -136,11 +150,11 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc
 	ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
 	-@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then mkdir \
 	$(DESTDIR)$(LIBPATH)/pkgconfig; fi
-	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
+	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/$(LIBNAME).pc
 	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.pc
-	cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
-	chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
-	(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf libpng12.pc libpng.pc)
+	cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/$(LIBNAME).pc
+	chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/$(LIBNAME).pc
+	(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf $(LIBNAME).pc libpng.pc)

 install-man: libpng.3 libpngpf.3 png.5
 	-@if [ ! -d $(DESTDIR)$(MANPATH) ]; then mkdir $(DESTDIR)$(MANPATH); fi
@@ -155,14 +169,14 @@ install-man: libpng.3 libpngpf.3 png.5
 	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man5/png.5
 	cp png.5 $(DESTDIR)$(MANPATH)/man5

-install-config: scripts/libpng-config
+install-config: libpng-config
 	-@if [ ! -d $(DESTDIR)$(BINPATH) ]; then \
 	mkdir $(DESTDIR)$(BINPATH); fi
 	-@/bin/rm -f $(DESTDIR)$(BINPATH)/libpng-config
-	-@/bin/rm -f $(DESTDIR)$(BINPATH)/libpng12-config
-	cp scripts/libpng-config $(DESTDIR)$(BINPATH)/libpng12-config
-	chmod 755 $(DESTDIR)$(BINPATH)/libpng12-config
-	(cd $(DESTDIR)$(BINPATH); ln -sf libpng12-config libpng-config)
+	-@/bin/rm -f $(DESTDIR)$(BINPATH)/$(LIBNAME)-config
+	cp libpng-config $(DESTDIR)$(BINPATH)/$(LIBNAME)-config
+	chmod 755 $(DESTDIR)$(BINPATH)/$(LIBNAME)-config
+	(cd $(DESTDIR)$(BINPATH); ln -sf $(LIBNAME)-config libpng-config)

 install: install-static install-shared install-man install-config

--- a/scripts/makefile.macosx
+++ b/scripts/makefile.macosx
@@ -17,7 +17,7 @@ ZLIBINC=../zlib
 CC=cc

 PNGMAJ = 0
-PNGMIN = 1.2.3rc4
+PNGMIN = 1.2.3rc5
 PNGVER = $(PNGMAJ).$(PNGMIN)

 CFLAGS=-fno-common -I$(ZLIBINC) -O # -g -DPNG_DEBUG=5
@@ -49,12 +49,27 @@ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
 	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
 	pngwtran.o pngmem.o pngerror.o pngpread.o

-all: libpng.a pngtest shared libpng.pc
+all: libpng.a pngtest shared

 shared: $(LIBNAME).$(PNGVER).$(SHAREDLIB_POSTFIX)

 libpng.pc:
-	cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc
+	cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! | \
+	   sed -e s/-lm// > libpng.pc
+
+libpng-config:
+	( cat scripts/libpng-config-head.in; \
+	echo prefix=\"$(prefix)\"; \
+	echo cppflags=\"-I$(INCPATH)/libpng12"; \
+	echo cflags=\"\"; \
+	echo ldflags=\"-L$(LIBPATH)\"; \
+	echo libs=\"-lpng12 -lz\"; \
+	cat scripts/libpng-config-body.in ) > libpng-config
+	chmod +x libpng-config
+
+	cat scripts/libpng-config.in | sed -e s\!@PREFIX@!$(prefix)! > \
+	libpng-config
+	chmod +x libpng-config

 libpng.a: $(OBJS)
 	ar rc $@  $(OBJS)
@@ -69,7 +84,6 @@ pngtest: pngtest.o libpng.a
 test: pngtest
 	./pngtest

-
 install-headers: png.h pngconf.h
 	-@if [ ! -d $(DESTDIR)$(INCPATH) ]; then mkdir $(DESTDIR)$(INCPATH); fi
 	-@if [ ! -d $(DESTDIR)$(INCPATH)/$(LIBNAME) ]; then \
@@ -112,11 +126,11 @@ install-shared: install-headers $(LIBNAME).$(PNGVER).$(SHAREDLIB_POSTFIX) libpng
 	$(LIBNAME).$(SHAREDLIB_POSTFIX))
 	-@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \
 	mkdir $(DESTDIR)$(LIBPATH)/pkgconfig; fi
-	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
+	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/$(LIBNAME).pc
 	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.pc
-	cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
-	chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
-	(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -f -s libpng12.pc libpng.pc)
+	cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/$(LIBNAME).pc
+	chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/$(LIBNAME).pc
+	(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -f -s $(LIBNAME).pc libpng.pc)

 install-man: libpng.3 libpngpf.3 png.5
 	-@if [ ! -d $(DESTDIR)$(MANPATH) ]; then mkdir $(DESTDIR)$(MANPATH); fi
@@ -131,14 +145,14 @@ install-man: libpng.3 libpngpf.3 png.5
 	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man5/png.5
 	cp png.5 $(DESTDIR)$(MANPATH)/man5

-install-config: scripts/libpng-config
+install-config: libpng-config
 	-@if [ ! -d $(DESTDIR)$(BINPATH) ]; then \
 	mkdir $(DESTDIR)$(BINPATH); fi
 	-@/bin/rm -f $(DESTDIR)$(BINPATH)/libpng-config
-	-@/bin/rm -f $(DESTDIR)$(BINPATH)/libpng12-config
-	cp scripts/libpng-config $(DESTDIR)$(BINPATH)/libpng12-config
-	chmod 755 $(DESTDIR)$(BINPATH)/libpng12-config
-	(cd $(DESTDIR)$(BINPATH); ln -sf libpng12-config libpng-config)
+	-@/bin/rm -f $(DESTDIR)$(BINPATH)/$(LIBNAME)-config
+	cp libpng-config $(DESTDIR)$(BINPATH)/$(LIBNAME)-config
+	chmod 755 $(DESTDIR)$(BINPATH)/$(LIBNAME)-config
+	(cd $(DESTDIR)$(BINPATH); ln -sf $(LIBNAME)-config libpng-config)

 install: install-static install-shared install-man install-config

--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng12

 LIB=	png12
 SHLIB_MAJOR=	0
-SHLIB_MINOR=	1.2.3rc4
+SHLIB_MINOR=	1.2.3rc5
 SRCS=	pnggccrd.c png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
 		pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
 		pngwtran.c pngmem.c pngerror.c pngpread.c
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng

 LIB=	png
 SHLIB_MAJOR=	3
-SHLIB_MINOR=	1.2.3rc4
+SHLIB_MINOR=	1.2.3rc5
 SRCS=	pnggccrd.c png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
 		pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
 		pngwtran.c pngmem.c pngerror.c pngpread.c
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -26,7 +26,7 @@ RANLIB=echo
 # read libpng.txt or png.h to see why PNGMAJ is 0.  You should not
 # have to change it.
 PNGMAJ = 0
-PNGMIN = 1.2.3rc4
+PNGMIN = 1.2.3rc5
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12

@@ -56,7 +56,7 @@ OBJSDLL = $(OBJS:.o=.pic.o)
 .c.pic.o:
 	$(CC) -c $(CFLAGS) -KPIC -o $@ $*.c

-all: libpng.a $(LIBNAME).so pngtest libpng.pc
+all: libpng.a $(LIBNAME).so pngtest

 libpng.a: $(OBJS)
 	ar rc $@ $(OBJS)
@@ -65,6 +65,16 @@ libpng.a: $(OBJS)
 libpng.pc:
 	cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc

+libpng-config:
+	( cat scripts/libpng-config-head.in; \
+	echo prefix=\"$(prefix)\"; \
+	echo cppflags=\"-I$(INCPATH)/libpng12"; \
+	echo cflags=\"-belf\"; \
+	echo ldflags=\"-L$(LIBPATH)\"; \
+	echo libs=\"-lpng12 -lz -lm\"; \
+	cat scripts/libpng-config-body.in ) > libpng-config
+	chmod +x libpng-config
+
 $(LIBNAME).so: $(LIBNAME).so.$(PNGMAJ)
 	ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so

@@ -120,11 +130,11 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc
 	ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
 	-@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \
 	mkdir $(DESTDIR)$(LIBPATH)/pkgconfig; fi
-	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
+	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/$(LIBNAME).pc
 	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.pc
-	cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
-	chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
-	(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -f -s libpng12.pc libpng.pc)
+	cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/$(LIBNAME).pc
+	chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/$(LIBNAME).pc
+	(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -f -s $(LIBNAME).pc libpng.pc)

 install-man: libpng.3 libpngpf.3 png.5
 	-@if [ ! -d $(DESTDIR)$(MANPATH) ]; then mkdir $(DESTDIR)$(MANPATH); fi
@@ -139,14 +149,14 @@ install-man: libpng.3 libpngpf.3 png.5
 	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man5/png.5
 	cp png.5 $(DESTDIR)$(MANPATH)/man5

-install-config: scripts/libpng-config
+install-config: libpng-config
 	-@if [ ! -d $(DESTDIR)$(BINPATH) ]; then \
 	mkdir $(DESTDIR)$(BINPATH); fi
 	-@/bin/rm -f $(DESTDIR)$(BINPATH)/libpng-config
-	-@/bin/rm -f $(DESTDIR)$(BINPATH)/libpng12-config
-	cp scripts/libpng-config $(DESTDIR)$(BINPATH)/libpng12-config
-	chmod 755 $(DESTDIR)$(BINPATH)/libpng12-config
-	(cd $(DESTDIR)$(BINPATH); ln -sf libpng12-config libpng-config)
+	-@/bin/rm -f $(DESTDIR)$(BINPATH)/$(LIBNAME)-config
+	cp libpng-config $(DESTDIR)$(BINPATH)/$(LIBNAME)-config
+	chmod 755 $(DESTDIR)$(BINPATH)/$(LIBNAME)-config
+	(cd $(DESTDIR)$(BINPATH); ln -sf $(LIBNAME)-config libpng-config)

 install: install-static install-shared install-man install-config

--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -34,13 +34,13 @@ WARNMORE= # -g -DPNG_DEBUG=5
 CFLAGS=$(ABI) -I$(ZLIBINC) -O2 $(WARNMORE) -fPIC -mabi=n32
 LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm
 LDSHARED=CC $(ABI) -shared
-
-PNGMAJ = 0
-PNGMIN = 1.2.3rc4
-PNGVER = $(PNGMAJ).$(PNGMIN)
 # See "man dso" for info about shared objects
-LIBS=libpng12.so.$(PNGVER)
+
 LIBNAME=libpng12
+PNGMAJ = 0
+PNGMIN = 1.2.3rc5
+PNGVER = $(PNGMAJ).$(PNGMIN)
+LIBS=$(LIBNAME).so.$(PNGVER)
 INCPATH=$(prefix)/include
 LIBPATH=$(prefix)/lib32
 MANPATH=$(prefix)/man
@@ -63,7 +63,7 @@ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
 	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
 	pngwtran.o pngmem.o pngerror.o pngpread.o

-all: libpng.a $(LIBNAME).so.$(PNGVER) pngtest libpng.pc
+all: libpng.a $(LIBNAME).so.$(PNGVER) pngtest

 libpng.a: $(OBJS)
 	ar rc $@  $(OBJS)
@@ -72,6 +72,17 @@ libpng.a: $(OBJS)
 libpng.pc:
 	cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc

+libpng-config:
+	( cat scripts/libpng-config-head.in; \
+	echo prefix=\"$(prefix)\"; \
+	echo cppflags=\"-I$(INCPATH)/libpng12 -DPNG_USE_PNGGCCRD \
+		-DPNG_NO_ASSEMBLER_CODE\"; \
+	echo cflags=\"$(ABI)\"; \
+	echo ldflags=\"-L$(LIBPATH)\"; \
+	echo libs=\"-lpng12 -lz -lm\"; \
+	cat scripts/libpng-config-body.in ) > libpng-config
+	chmod +x libpng-config
+
 $(LIBNAME).so.$(PNGVER): $(OBJS)
 	$(LDSHARED) -o $@ $(OBJS)
 	rm -f $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)
@@ -121,11 +132,11 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc
 	ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
 	-@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \
 	mkdir $(DESTDIR)$(LIBPATH)/pkgconfig; fi
-	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
+	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/$(LIBNAME).pc
 	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.pc
-	cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
-	chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
-	(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf libpng12.pc libpng.pc)
+	cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/$(LIBNAME).pc
+	chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/$(LIBNAME).pc
+	(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf $(LIBNAME).pc libpng.pc)

 install-man: libpng.3 libpngpf.3 png.5
 	-@if [ ! -d $(DESTDIR)$(MANPATH) ]; then mkdir $(DESTDIR)$(MANPATH); fi
@@ -140,14 +151,14 @@ install-man: libpng.3 libpngpf.3 png.5
 	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man5/png.5
 	cp png.5 $(DESTDIR)$(MANPATH)/man5

-install-config: scripts/libpng-config
+install-config: libpng-config
 	-@if [ ! -d $(DESTDIR)$(BINPATH) ]; then \
 	mkdir $(DESTDIR)$(BINPATH); fi
 	-@/bin/rm -f $(DESTDIR)$(BINPATH)/libpng-config
-	-@/bin/rm -f $(DESTDIR)$(BINPATH)/libpng12-config
-	cp scripts/libpng-config $(DESTDIR)$(BINPATH)/libpng12-config
-	chmod 755 $(DESTDIR)$(BINPATH)/libpng12-config
-	(cd $(DESTDIR)$(BINPATH); ln -sf libpng12-config libpng-config)
+	-@/bin/rm -f $(DESTDIR)$(BINPATH)/$(LIBNAME)-config
+	cp libpng-config $(DESTDIR)$(BINPATH)/$(LIBNAME)-config
+	chmod 755 $(DESTDIR)$(BINPATH)/$(LIBNAME)-config
+	(cd $(DESTDIR)$(BINPATH); ln -sf $(LIBNAME)-config libpng-config)

 install: install-static install-shared install-man install-config

--- a/scripts/makefile.sgi
+++ b/scripts/makefile.sgi
@@ -27,11 +27,11 @@ CFLAGS=$(ABI) -I$(ZLIBINC) -O $(WARNMORE) -DPNG_USE_PNGGCCRD -DPNG_NO_ASSEMBLER_
 LDFLAGS_A=$(ABI) -L. -L$(ZLIBLIB) -lpng12 -lz -lm
 LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm
 LDSHARED=cc $(ABI) -shared
-
 # See "man dso" for info about shared objects
+
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.3rc4
+PNGMIN = 1.2.3rc5
 PNGVER = $(PNGMAJ).$(PNGMIN)

 RANLIB=echo
@@ -58,13 +58,24 @@ OBJS = pnggccrd.o png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
 	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
 	pngwtran.o pngmem.o pngerror.o pngpread.o

-all: libpng.a pngtest shared libpng.pc
+all: libpng.a pngtest shared

 shared: $(LIBNAME).so.$(PNGVER)

 libpng.pc:
 	cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc

+libpng-config:
+	( cat scripts/libpng-config-head.in; \
+	echo prefix=\"$(prefix)\"; \
+	echo cppflags=\"-I$(INCPATH)/libpng12 -DPNG_USE_PNGGCCRD \
+		-DPNG_NO_ASSEMBLER_CODE\"; \
+	echo cflags=\"$(ABI)\"; \
+	echo ldflags=\"-L$(LIBPATH)\"; \
+	echo libs=\"-lpng12 -lz -lm\"; \
+	cat scripts/libpng-config-body.in ) > libpng-config
+	chmod +x libpng-config
+
 libpng.a: $(OBJS)
 	ar rc $@  $(OBJS)
 	$(RANLIB) $@
@@ -117,11 +128,11 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc
 	ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
 	-@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \
 	mkdir $(DESTDIR)$(LIBPATH)/pkgconfig; fi
-	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
+	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/$(LIBNAME).pc
 	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.pc
-	cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
-	chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
-	(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf libpng12.pc libpng.pc)
+	cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/$(LIBNAME).pc
+	chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/$(LIBNAME).pc
+	(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf $(LIBNAME).pc libpng.pc)

 install-man: libpng.3 libpngpf.3 png.5
 	-@if [ ! -d $(DESTDIR)$(MANPATH) ]; then mkdir $(DESTDIR)$(MANPATH); fi
@@ -136,14 +147,14 @@ install-man: libpng.3 libpngpf.3 png.5
 	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man5/png.5
 	cp png.5 $(DESTDIR)$(MANPATH)/man5

-install-config: scripts/libpng-config
+install-config: libpng-config
 	-@if [ ! -d $(DESTDIR)$(BINPATH) ]; then \
 	mkdir $(DESTDIR)$(BINPATH); fi
 	-@/bin/rm -f $(DESTDIR)$(BINPATH)/libpng-config
-	-@/bin/rm -f $(DESTDIR)$(BINPATH)/libpng12-config
-	cp scripts/libpng-config $(DESTDIR)$(BINPATH)/libpng12-config
-	chmod 755 $(DESTDIR)$(BINPATH)/libpng12-config
-	(cd $(DESTDIR)$(BINPATH); ln -sf libpng12-config libpng-config)
+	-@/bin/rm -f $(DESTDIR)$(BINPATH)/$(LIBNAME)-config
+	cp libpng-config $(DESTDIR)$(BINPATH)/$(LIBNAME)-config
+	chmod 755 $(DESTDIR)$(BINPATH)/$(LIBNAME)-config
+	(cd $(DESTDIR)$(BINPATH); ln -sf $(LIBNAME)-config libpng-config)

 install: install-static install-shared install-man install-config

--- a/scripts/makefile.so9
+++ b/scripts/makefile.so9
@@ -36,7 +36,7 @@ RANLIB=echo
 # read libpng.txt or png.h to see why PNGMAJ is 0.  You should not
 # have to change it.
 PNGMAJ = 0
-PNGMIN = 1.2.3rc4
+PNGMIN = 1.2.3rc5
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12

@@ -66,7 +66,7 @@ OBJSDLL = $(OBJS:.o=.pic.o)
 .c.pic.o:
 	$(CC) -c $(CFLAGS) -KPIC -o $@ $*.c

-all: libpng.a $(LIBNAME).so pngtest libpng.pc
+all: libpng.a $(LIBNAME).so pngtest

 libpng.a: $(OBJS)
 	ar rc $@ $(OBJS)
@@ -75,6 +75,16 @@ libpng.a: $(OBJS)
 libpng.pc:
 	cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc

+libpng-config:
+	( cat scripts/libpng-config-head.in; \
+	echo prefix=\"$(prefix)\"; \
+	echo cppflags=\"-I$(INCPATH)/libpng12\"; \
+	echo cflags=\"\"; \
+	echo ldflags=\"-L$(LIBPATH) -R$(LIBPATH)\"; \
+	echo libs=\"-lpng12 -lz -lm\"; \
+	cat scripts/libpng-config-body.in ) > libpng-config
+	chmod +x libpng-config
+
 $(LIBNAME).so: $(LIBNAME).so.$(PNGMAJ)
 	ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so

@@ -139,11 +149,11 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc
 	ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
 	-@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then mkdir \
 	$(DESTDIR)$(LIBPATH)/pkgconfig; fi
-	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
+	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/$(LIBNAME).pc
 	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.pc
-	cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
-	chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
-	(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -f -s libpng12.pc libpng.pc)
+	cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/$(LIBNAME).pc
+	chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/$(LIBNAME).pc
+	(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -f -s $(LIBNAME).pc libpng.pc)

 install-man: libpng.3 libpngpf.3 png.5
 	-@if [ ! -d $(DESTDIR)$(MANPATH) ]; then mkdir $(DESTDIR)$(MANPATH); fi
@@ -158,14 +168,14 @@ install-man: libpng.3 libpngpf.3 png.5
 	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man5/png.5
 	cp png.5 $(DESTDIR)$(MANPATH)/man5

-install-config: scripts/libpng-config
+install-config: libpng-config
 	-@if [ ! -d $(DESTDIR)$(BINPATH) ]; then \
 	mkdir $(DESTDIR)$(BINPATH); fi
 	-@/bin/rm -f $(DESTDIR)$(BINPATH)/libpng-config
-	-@/bin/rm -f $(DESTDIR)$(BINPATH)/libpng12-config
-	cp scripts/libpng-config $(DESTDIR)$(BINPATH)/libpng12-config
-	chmod 755 $(DESTDIR)$(BINPATH)/libpng12-config
-	(cd $(DESTDIR)$(BINPATH); ln -sf libpng12-config libpng-config)
+	-@/bin/rm -f $(DESTDIR)$(BINPATH)/$(LIBNAME)-config
+	cp libpng-config $(DESTDIR)$(BINPATH)/$(LIBNAME)-config
+	chmod 755 $(DESTDIR)$(BINPATH)/$(LIBNAME)-config
+	(cd $(DESTDIR)$(BINPATH); ln -sf $(LIBNAME)-config libpng-config)

 install: install-static install-shared install-man install-config

--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -32,7 +32,7 @@ RANLIB=echo
 # read libpng.txt or png.h to see why PNGMAJ is 0.  You should not
 # have to change it.
 PNGMAJ = 0
-PNGMIN = 1.2.3rc4
+PNGMIN = 1.2.3rc5
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12

@@ -62,7 +62,7 @@ OBJSDLL = $(OBJS:.o=.pic.o)
 .c.pic.o:
 	$(CC) -c $(CFLAGS) -fPIC -o $@ $*.c

-all: libpng.a $(LIBNAME).so pngtest libpng.pc
+all: libpng.a $(LIBNAME).so pngtest

 libpng.a: $(OBJS)
 	ar rc $@ $(OBJS)
@@ -71,6 +71,17 @@ libpng.a: $(OBJS)
 libpng.pc:
 	cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc

+libpng-config:
+	( cat scripts/libpng-config-head.in; \
+	echo prefix=\"$(prefix)\"; \
+	echo cppflags=\"-I$(INCPATH)/libpng12 -DPNG_USE_PNGGCCRD \
+		-DPNG_NO_ASSEMBLER_CODE\"; \
+	echo cflags=\"$(ABI)\"; \
+	echo ldflags=\"-L$(LIBPATH) -R$(LIBPATH)\"; \
+	echo libs=\"-lpng12 -lz -lm\"; \
+	cat scripts/libpng-config-body.in ) > libpng-config
+	chmod +x libpng-config
+
 $(LIBNAME).so: $(LIBNAME).so.$(PNGMAJ)
 	ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so

@@ -135,11 +146,11 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc
 	ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ))
 	-@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \
 	mkdir $(DESTDIR)$(LIBPATH)/pkgconfig; fi
-	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
+	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/$(LIBNAME).pc
 	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.pc
-	cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
-	chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
-	(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -f -s libpng12.pc libpng.pc)
+	cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/$(LIBNAME).pc
+	chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/$(LIBNAME).pc
+	(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -f -s $(LIBNAME).pc libpng.pc)

 install-man: libpng.3 libpngpf.3 png.5
 	-@if [ ! -d $(DESTDIR)$(MANPATH) ]; then mkdir $(DESTDIR)$(MANPATH); fi
@@ -154,14 +165,14 @@ install-man: libpng.3 libpngpf.3 png.5
 	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man5/png.5
 	cp png.5 $(DESTDIR)$(MANPATH)/man5

-install-config: scripts/libpng-config
+install-config: libpng-config
 	-@if [ ! -d $(DESTDIR)$(BINPATH) ]; then \
 	mkdir $(DESTDIR)$(BINPATH); fi
 	-@/bin/rm -f $(DESTDIR)$(BINPATH)/libpng-config
-	-@/bin/rm -f $(DESTDIR)$(BINPATH)/libpng12-config
-	cp scripts/libpng-config $(DESTDIR)$(BINPATH)/libpng12-config
-	chmod 755 $(DESTDIR)$(BINPATH)/libpng12-config
-	(cd $(DESTDIR)$(BINPATH); ln -sf libpng12-config libpng-config)
+	-@/bin/rm -f $(DESTDIR)$(BINPATH)/$(LIBNAME)-config
+	cp libpng-config $(DESTDIR)$(BINPATH)/$(LIBNAME)-config
+	chmod 755 $(DESTDIR)$(BINPATH)/$(LIBNAME)-config
+	(cd $(DESTDIR)$(BINPATH); ln -sf $(LIBNAME)-config libpng-config)

 install: install-static install-shared install-man install-config

--- a/scripts/pngdef.pas
+++ b/scripts/pngdef.pas
@@ -7,7 +7,7 @@ unit pngdef;
 interface

 const
-  PNG_LIBPNG_VER_STRING = '1.2.3rc4';
+  PNG_LIBPNG_VER_STRING = '1.2.3rc5';
  PNG_LIBPNG_VER        =  10203;

 type
--- a/scripts/pngos2.def
+++ b/scripts/pngos2.def
@@ -2,7 +2,7 @@
 ; PNG.LIB module definition file for OS/2
 ;----------------------------------------

-; Version 1.2.3rc4
+; Version 1.2.3rc5

 LIBRARY		PNG
 DESCRIPTION	"PNG image compression library for OS/2"
@@ -198,14 +198,10 @@ EXPORTS

 ; Added at version 1.2.2:
  png_handle_as_unknown
-  png_zalloc
-  png_zfree

-; Added at version 1.2.3
-  png_default_read_data
-  png_default_write_data
-  png_default_flush
-  png_push_fill_buffer
+; Added at version 1.2.2 and deleted from 1.2.3:
+; png_zalloc
+; png_zfree

 ; These are not present when libpng is compiled with PNG_NO_GLOBAL_ARRAYS
  png_libpng_ver