24 files changed, 500 insertions, 215 deletions
diff --git a/scripts/libpng-config b/scripts/libpng-config
new file mode 100755
index 000000000..8d34e5bfd
--- /dev/null
+++ b/scripts/libpng-config
@@ -0,0 +1,92 @@
+#! /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
diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in
index 57e918934..0391f37f7 100644
--- 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.3rc3
+Version: 1.2.3rc4
 Libs: -L${libdir} -lpng12
 Cflags: -I${includedir}/libpng12
diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu
index e0237499f..d4f689bd1 100644
--- a/scripts/makefile.32sunu
+++ b/scripts/makefile.32sunu
@@ -33,12 +33,13 @@ RANLIB=echo
 
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.3rc3
+PNGMIN = 1.2.3rc4
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 INCPATH=$(prefix)/include
 LIBPATH=$(prefix)/lib
 MANPATH=$(prefix)/man
+BINPATH=$(prefix)/bin
 
 # override DESTDIR= on the make install command line to easily support
 # installing into a temporary location.  Example:
@@ -134,24 +135,35 @@ 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
-	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.12.pc
+	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.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)
 
 install-man: libpng.3 libpngpf.3 png.5
-	-@if [ ! -d $(MANPATH) ]; then mkdir $(MANPATH); fi
-	-@if [ ! -d $(MANPATH)/man3 ]; then mkdir $(MANPATH)/man3; fi
-	-@/bin/rm -f $(MANPATH)/man3/libpng.3
-	-@/bin/rm -f $(MANPATH)/man3/libpngpf.3
-	cp libpng.3 $(MANPATH)/man3
-	cp libpngpf.3 $(MANPATH)/man3
-	-@if [ ! -d $(MANPATH)/man5 ]; then mkdir $(MANPATH)/man5; fi
-	-@/bin/rm -f $(MANPATH)/man5/png.5
-	cp png.5 $(MANPATH)/man5
-
-install: install-static install-shared install-man
+	-@if [ ! -d $(DESTDIR)$(MANPATH) ]; then mkdir $(DESTDIR)$(MANPATH); fi
+	-@if [ ! -d $(DESTDIR)$(MANPATH)/man3 ]; then \
+	mkdir $(DESTDIR)$(MANPATH)/man3; fi
+	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man3/libpng.3
+	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man3/libpngpf.3
+	cp libpng.3 $(DESTDIR)$(MANPATH)/man3
+	cp libpngpf.3 $(DESTDIR)$(MANPATH)/man3
+	-@if [ ! -d $(DESTDIR)$(MANPATH)/man5 ]; then \
+	mkdir $(DESTDIR)$(MANPATH)/man5; fi
+	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man5/png.5
+	cp png.5 $(DESTDIR)$(MANPATH)/man5
+
+install-config: scripts/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)
+
+install: install-static install-shared install-man install-config
 
 clean:
 	/bin/rm -f *.o libpng.a $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \
diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu
index 43ec1d755..d3bd96f3a 100644
--- a/scripts/makefile.64sunu
+++ b/scripts/makefile.64sunu
@@ -33,12 +33,13 @@ RANLIB=echo
 
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.3rc3
+PNGMIN = 1.2.3rc4
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 INCPATH=$(prefix)/include
 LIBPATH=$(prefix)/lib
 MANPATH=$(prefix)/man
+BINPATH=$(prefix)/bin
 
 # override DESTDIR= on the make install command line to easily support
 # installing into a temporary location.  Example:
@@ -134,24 +135,35 @@ 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/libpng.12.pc
+	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.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)
 
 install-man: libpng.3 libpngpf.3 png.5
-	-@if [ ! -d $(MANPATH) ]; then mkdir $(MANPATH); fi
-	-@if [ ! -d $(MANPATH)/man3 ]; then mkdir $(MANPATH)/man3; fi
-	-@/bin/rm -f $(MANPATH)/man3/libpng.3
-	-@/bin/rm -f $(MANPATH)/man3/libpngpf.3
-	cp libpng.3 $(MANPATH)/man3
-	cp libpngpf.3 $(MANPATH)/man3
-	-@if [ ! -d $(MANPATH)/man5 ]; then mkdir $(MANPATH)/man5; fi
-	-@/bin/rm -f $(MANPATH)/man5/png.5
-	cp png.5 $(MANPATH)/man5
-
-install: install-static install-shared install-man
+	-@if [ ! -d $(DESTDIR)$(MANPATH) ]; then mkdir $(DESTDIR)$(MANPATH); fi
+	-@if [ ! -d $(DESTDIR)$(MANPATH)/man3 ]; then \
+	mkdir $(DESTDIR)$(MANPATH)/man3; fi
+	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man3/libpng.3
+	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man3/libpngpf.3
+	cp libpng.3 $(DESTDIR)$(MANPATH)/man3
+	cp libpngpf.3 $(DESTDIR)$(MANPATH)/man3
+	-@if [ ! -d $(DESTDIR)$(MANPATH)/man5 ]; then \
+	mkdir $(DESTDIR)$(MANPATH)/man5; fi
+	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man5/png.5
+	cp png.5 $(DESTDIR)$(MANPATH)/man5
+
+install-config: scripts/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)
+
+install: install-static install-shared install-man install-config
 
 clean:
 	/bin/rm -f *.o libpng.a $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \
diff --git a/scripts/makefile.aix b/scripts/makefile.aix
index 4cbe899aa..857851529 100644
--- a/scripts/makefile.aix
+++ b/scripts/makefile.aix
@@ -19,7 +19,7 @@ RM = rm -f
 # read libpng.txt or png.h to see why PNGMAJ is 0.  You should not
 # have to change it.
 PNGMAJ = 0
-PNGMIN = 1.2.3rc3
+PNGMIN = 1.2.3rc4
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 prefix=/usr/local
diff --git a/scripts/makefile.beos b/scripts/makefile.beos
index 05a49fe13..91aa204b8 100644
--- 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.3rc3
+PNGMIN = 1.2.3rc4
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 ALIGN=
@@ -40,6 +40,7 @@ prefix=/usr/local
 INCPATH=$(prefix)/include
 LIBPATH=$(prefix)/lib
 MANPATH=$(prefix)/man
+BINPATH=$(prefix)/bin
 
 # override DESTDIR= on the make install command line to easily support
 # installing into a temporary location.  Example:
@@ -123,24 +124,35 @@ 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/libpng.12.pc
+	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.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)
 
 install-man: libpng.3 libpngpf.3 png.5
-	-@if [ ! -d $(MANPATH) ]; then mkdir $(MANPATH); fi
-	-@if [ ! -d $(MANPATH)/man3 ]; then mkdir $(MANPATH)/man3; fi
-	-@/bin/rm -f $(MANPATH)/man3/libpng.3
-	-@/bin/rm -f $(MANPATH)/man3/libpngpf.3
-	cp libpng.3 $(MANPATH)/man3
-	cp libpngpf.3 $(MANPATH)/man3
-	-@if [ ! -d $(MANPATH)/man5 ]; then mkdir $(MANPATH)/man5; fi
-	-@/bin/rm -f $(MANPATH)/man5/png.5
-	cp png.5 $(MANPATH)/man5
-
-install: install-static install-shared install-man
+	-@if [ ! -d $(DESTDIR)$(MANPATH) ]; then mkdir $(DESTDIR)$(MANPATH); fi
+	-@if [ ! -d $(DESTDIR)$(MANPATH)/man3 ]; then \
+	mkdir $(DESTDIR)$(MANPATH)/man3; fi
+	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man3/libpng.3
+	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man3/libpngpf.3
+	cp libpng.3 $(DESTDIR)$(MANPATH)/man3
+	cp libpngpf.3 $(DESTDIR)$(MANPATH)/man3
+	-@if [ ! -d $(DESTDIR)$(MANPATH)/man5 ]; then \
+	mkdir $(DESTDIR)$(MANPATH)/man5; fi
+	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man5/png.5
+	cp png.5 $(DESTDIR)$(MANPATH)/man5
+
+install-config: scripts/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)
+
+install: install-static install-shared install-man install-config
 
 clean:
 	/bin/rm -f *.o libpng.a $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \
diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin
index 2a3dbee9f..5ccb0b339 100644
--- a/scripts/makefile.cygwin
+++ b/scripts/makefile.cygwin
@@ -52,7 +52,7 @@ CFLAGS=$(MINGW_CCFLAGS) -I$(ZLIBINC) -Wall -O3 $(ALIGN) -funroll-loops \
 LIBNAME=libpng12
 PNGMAJ = 0
 PNGDLL = 12
-PNGMIN = 1.2.3rc3
+PNGMIN = 1.2.3rc4
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 SHAREDLIB=cygpng$(PNGDLL).dll
@@ -74,8 +74,8 @@ LIBPATH=$(prefix)/lib
 
 BINPATH=$(prefix)/bin
 MANPATH=$(prefix)/man
-MAN3PATH=$(MANPATH)/man3
-MAN5PATH=$(MANPATH)/man5
+MAN3PATH=$(DESTDIR)$(MANPATH)/man3
+MAN5PATH=$(DESTDIR)$(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 \
@@ -149,8 +149,6 @@ test-static: pngtest-stat$(EXE)
 test-shared: pngtest$(EXE)
 	./pngtest
 
-install: install-static install-shared
-
 install-static: $(STATLIB) install-headers install-man
 	-@if [ ! -d $(DESTDIR)$(LIBPATH) ]; then mkdir -p $(DESTDIR)$(LIBPATH); fi
 	install -m 644 $(STATLIB) $(DESTDIR)$(LIBPATH)/$(LIBNAME).a
@@ -162,7 +160,7 @@ install-shared: $(SHAREDLIB) libpng.pc install-headers install-man
 	-@if [ ! -d $(DESTDIR)$(BINPATH) ]; then mkdir -p $(DESTDIR)$(BINPATH); fi
 	-@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \
 	mkdir -p $(DESTDIR)$(LIBPATH)/pkgconfig; fi
-	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.12.pc
+	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
 	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.pc
 	install -m 644 $(IMPLIB) $(DESTDIR)$(LIBPATH)/$(LIBNAME).dll.a
 	-@rm -f $(DESTDIR)$(LIBPATH)/$(IMPLIB)
@@ -172,8 +170,10 @@ install-shared: $(SHAREDLIB) libpng.pc install-headers install-man
 	(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf libpng12.pc libpng.pc)
 
 install-headers:
-	-@if [ ! -d $(DESTDIR)$(INCPATH) ]; then mkdir -p $(DESTDIR)$(INCPATH); fi
-	-@if [ ! -d $(DESTDIR)$(INCPATH)/$(LIBNAME) ]; then mkdir -p $(DESTDIR)$(INCPATH)/$(LIBNAME); fi
+	-@if [ ! -d $(DESTDIR)$(INCPATH) ]; then \
+	mkdir -p $(DESTDIR)$(INCPATH); fi
+	-@if [ ! -d $(DESTDIR)$(INCPATH)/$(LIBNAME) ]; then \
+	mkdir -p $(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)
@@ -181,11 +181,24 @@ install-headers:
 	(cd $(DESTDIR)$(INCPATH); ln -sf $(LIBNAME) libpng; ln -sf $(LIBNAME)/* .)
 
 install-man:
-	-@if [ ! -d $(DESTDIR)$(MAN3PATH) ]; then mkdir -p $(DESTDIR)$(MAN3PATH); fi
-	-@if [ ! -d $(DESTDIR)$(MAN5PATH) ]; then mkdir -p $(DESTDIR)$(MAN5PATH); fi
+	-@if [ ! -d $(DESTDIR)$(MAN3PATH) ]; then \
+	mkdir -p $(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)
 
+install-config: scripts/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)
+
+install: install-static install-shared install-man install-config
+
 clean:
 	/bin/rm -f *.pic.o *.o $(STATLIB) $(IMPLIB) $(SHAREDLIB) \
 	pngtest-stat$(EXE) pngtest$(EXE) pngout.png $(SHAREDDEF)
diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin
index 961606481..9f042c5b0 100644
--- a/scripts/makefile.darwin
+++ b/scripts/makefile.darwin
@@ -25,13 +25,14 @@ 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.3rc3
+PNGMIN = 1.2.3rc4
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12
 
 INCPATH=$(prefix)/include
 LIBPATH=$(prefix)/lib
 MANPATH=$(prefix)/man
+BINPATH=$(prefix)/bin
 
 # override DESTDIR= on the make install command line to easily support
 # installing into a temporary location.  Example:
@@ -115,24 +116,35 @@ 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/libpng.12.pc
+	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.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)
 
 install-man: libpng.3 libpngpf.3 png.5
-	-@if [ ! -d $(MANPATH) ]; then mkdir $(MANPATH); fi
-	-@if [ ! -d $(MANPATH)/man3 ]; then mkdir $(MANPATH)/man3; fi
-	-@/bin/rm -f $(MANPATH)/man3/libpng.3
-	-@/bin/rm -f $(MANPATH)/man3/libpngpf.3
-	cp libpng.3 $(MANPATH)/man3
-	cp libpngpf.3 $(MANPATH)/man3
-	-@if [ ! -d $(MANPATH)/man5 ]; then mkdir $(MANPATH)/man5; fi
-	-@/bin/rm -f $(MANPATH)/man5/png.5
-	cp png.5 $(MANPATH)/man5
-
-install: install-static install-shared install-man
+	-@if [ ! -d $(DESTDIR)$(MANPATH) ]; then mkdir $(DESTDIR)$(MANPATH); fi
+	-@if [ ! -d $(DESTDIR)$(MANPATH)/man3 ]; then \
+	mkdir $(DESTDIR)$(MANPATH)/man3; fi
+	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man3/libpng.3
+	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man3/libpngpf.3
+	cp libpng.3 $(DESTDIR)$(MANPATH)/man3
+	cp libpngpf.3 $(DESTDIR)$(MANPATH)/man3
+	-@if [ ! -d $(DESTDIR)$(MANPATH)/man5 ]; then \
+	mkdir $(DESTDIR)$(MANPATH)/man5; fi
+	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man5/png.5
+	cp png.5 $(DESTDIR)$(MANPATH)/man5
+
+install-config: scripts/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)
+
+install: install-static install-shared install-man install-config
 
 clean:
 	rm -f *.o libpng.a $(LIBNAME).*dylib pngtest pngout.png
diff --git a/scripts/makefile.dec b/scripts/makefile.dec
index 753e23993..f037bc12d 100644
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -8,6 +8,7 @@ prefix=/usr/local
 INCPATH=$(prefix)/include
 LIBPATH=$(prefix)/lib
 MANPATH=$(prefix)/man
+BINPATH=$(prefix)/bin
 
 # override DESTDIR= on the make install command line to easily support
 # installing into a temporary location.  Example:
@@ -28,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.3rc3
+PNGMIN = 1.2.3rc4
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12
 
@@ -102,24 +103,35 @@ 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/libpng.12.pc
+	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.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)
 
 install-man: libpng.3 libpngpf.3 png.5
-	-@if [ ! -d $(MANPATH) ]; then mkdir $(MANPATH); fi
-	-@if [ ! -d $(MANPATH)/man3 ]; then mkdir $(MANPATH)/man3; fi
-	-@/bin/rm -f $(MANPATH)/man3/libpng.3
-	-@/bin/rm -f $(MANPATH)/man3/libpngpf.3
-	cp libpng.3 $(MANPATH)/man3
-	cp libpngpf.3 $(MANPATH)/man3
-	-@if [ ! -d $(MANPATH)/man5 ]; then mkdir $(MANPATH)/man5; fi
-	-@/bin/rm -f $(MANPATH)/man5/png.5
-	cp png.5 $(MANPATH)/man5
-
-install: install-static install-shared install-man
+	-@if [ ! -d $(DESTDIR)$(MANPATH) ]; then mkdir $(DESTDIR)$(MANPATH); fi
+	-@if [ ! -d $(DESTDIR)$(MANPATH)/man3 ]; then \
+	mkdir $(DESTDIR)$(MANPATH)/man3; fi
+	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man3/libpng.3
+	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man3/libpngpf.3
+	cp libpng.3 $(DESTDIR)$(MANPATH)/man3
+	cp libpngpf.3 $(DESTDIR)$(MANPATH)/man3
+	-@if [ ! -d $(DESTDIR)$(MANPATH)/man5 ]; then \
+	mkdir $(DESTDIR)$(MANPATH)/man5; fi
+	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man5/png.5
+	cp png.5 $(DESTDIR)$(MANPATH)/man5
+
+install-config: scripts/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)
+
+install: install-static install-shared install-man install-config
 
 clean:
 	/bin/rm -f *.o libpng.a $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* pngtest pngout.png
diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx
index 63f58459a..df01c3c1b 100644
--- a/scripts/makefile.gcmmx
+++ b/scripts/makefile.gcmmx
@@ -15,7 +15,7 @@
 
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.3rc3
+PNGMIN = 1.2.3rc4
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 CC=gcc
@@ -63,6 +63,7 @@ RANLIB=ranlib
 INCPATH=$(prefix)/include
 LIBPATH=$(prefix)/lib
 MANPATH=$(prefix)/man
+BINPATH=$(prefix)/bin
 
 # override DESTDIR= on the make install command line to easily support
 # installing into a temporary location.  Example:
@@ -161,24 +162,35 @@ 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/libpng.12.pc
+	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.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)
 
 install-man: libpng.3 libpngpf.3 png.5
-	-@if [ ! -d $(MANPATH) ]; then mkdir $(MANPATH); fi
-	-@if [ ! -d $(MANPATH)/man3 ]; then mkdir $(MANPATH)/man3; fi
-	-@/bin/rm -f $(MANPATH)/man3/libpng.3
-	-@/bin/rm -f $(MANPATH)/man3/libpngpf.3
-	cp libpng.3 $(MANPATH)/man3
-	cp libpngpf.3 $(MANPATH)/man3
-	-@if [ ! -d $(MANPATH)/man5 ]; then mkdir $(MANPATH)/man5; fi
-	-@/bin/rm -f $(MANPATH)/man5/png.5
-	cp png.5 $(MANPATH)/man5
-
-install: install-static install-shared install-man
+	-@if [ ! -d $(DESTDIR)$(MANPATH) ]; then mkdir $(DESTDIR)$(MANPATH); fi
+	-@if [ ! -d $(DESTDIR)$(MANPATH)/man3 ]; then \
+	mkdir $(DESTDIR)$(MANPATH)/man3; fi
+	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man3/libpng.3
+	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man3/libpngpf.3
+	cp libpng.3 $(DESTDIR)$(MANPATH)/man3
+	cp libpngpf.3 $(DESTDIR)$(MANPATH)/man3
+	-@if [ ! -d $(DESTDIR)$(MANPATH)/man5 ]; then \
+	mkdir $(DESTDIR)$(MANPATH)/man5; fi
+	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man5/png.5
+	cp png.5 $(DESTDIR)$(MANPATH)/man5
+
+install-config: scripts/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)
+
+install: install-static install-shared install-man install-config
 
 clean:
 	/bin/rm -f *.o libpng.a $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \
diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc
index eac0677aa..0cf4d7982 100644
--- a/scripts/makefile.hpgcc
+++ b/scripts/makefile.hpgcc
@@ -35,13 +35,14 @@ 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.3rc3
+PNGMIN = 1.2.3rc4
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12
 
 INCPATH=$(prefix)/include
 LIBPATH=$(prefix)/lib
 MANPATH=$(prefix)/man
+BINPATH=$(prefix)/bin
 
 # override DESTDIR= on the make install command line to easily support
 # installing into a temporary location.  Example:
@@ -126,24 +127,35 @@ 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/libpng.12.pc
+	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.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)
 
 install-man: libpng.3 libpngpf.3 png.5
-	-@if [ ! -d $(MANPATH) ]; then mkdir $(MANPATH); fi
-	-@if [ ! -d $(MANPATH)/man3 ]; then mkdir $(MANPATH)/man3; fi
-	-@/bin/rm -f $(MANPATH)/man3/libpng.3
-	-@/bin/rm -f $(MANPATH)/man3/libpngpf.3
-	cp libpng.3 $(MANPATH)/man3
-	cp libpngpf.3 $(MANPATH)/man3
-	-@if [ ! -d $(MANPATH)/man5 ]; then mkdir $(MANPATH)/man5; fi
-	-@/bin/rm -f $(MANPATH)/man5/png.5
-	cp png.5 $(MANPATH)/man5
-
-install: install-static install-shared install-man
+	-@if [ ! -d $(DESTDIR)$(MANPATH) ]; then mkdir $(DESTDIR)$(MANPATH); fi
+	-@if [ ! -d $(DESTDIR)$(MANPATH)/man3 ]; then \
+	mkdir $(DESTDIR)$(MANPATH)/man3; fi
+	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man3/libpng.3
+	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man3/libpngpf.3
+	cp libpng.3 $(DESTDIR)$(MANPATH)/man3
+	cp libpngpf.3 $(DESTDIR)$(MANPATH)/man3
+	-@if [ ! -d $(DESTDIR)$(MANPATH)/man5 ]; then \
+	mkdir $(DESTDIR)$(MANPATH)/man5; fi
+	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man5/png.5
+	cp png.5 $(DESTDIR)$(MANPATH)/man5
+
+install-config: scripts/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)
+
+install: install-static install-shared install-man install-config
 
 clean:
 	/bin/rm -f *.o libpng.a $(SHAREDLIB).sl $(SHAREDLIB).sl.$(PNGMAJ)* \
diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux
index db19154cb..ad43edc46 100644
--- 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.3rc3
+PNGMIN = 1.2.3rc4
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12
 
@@ -28,6 +28,7 @@ prefix=/opt/libpng
 INCPATH=$(prefix)/include
 LIBPATH=$(prefix)/lib
 MANPATH=$(prefix)/man
+BINPATH=$(prefix)/bin
 
 # override DESTDIR= on the make install command line to easily support
 # installing into a temporary location.  Example:
@@ -111,24 +112,35 @@ 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/libpng.12.pc
+	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.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)
 
 install-man: libpng.3 libpngpf.3 png.5
-	-@if [ ! -d $(MANPATH) ]; then mkdir $(MANPATH); fi
-	-@if [ ! -d $(MANPATH)/man3 ]; then mkdir $(MANPATH)/man3; fi
-	-@/bin/rm -f $(MANPATH)/man3/libpng.3
-	-@/bin/rm -f $(MANPATH)/man3/libpngpf.3
-	cp libpng.3 $(MANPATH)/man3
-	cp libpngpf.3 $(MANPATH)/man3
-	-@if [ ! -d $(MANPATH)/man5 ]; then mkdir $(MANPATH)/man5; fi
-	-@/bin/rm -f $(MANPATH)/man5/png.5
-	cp png.5 $(MANPATH)/man5
-
-install: install-static install-shared install-man
+	-@if [ ! -d $(DESTDIR)$(MANPATH) ]; then mkdir $(DESTDIR)$(MANPATH); fi
+	-@if [ ! -d $(DESTDIR)$(MANPATH)/man3 ]; then \
+	mkdir $(DESTDIR)$(MANPATH)/man3; fi
+	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man3/libpng.3
+	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man3/libpngpf.3
+	cp libpng.3 $(DESTDIR)$(MANPATH)/man3
+	cp libpngpf.3 $(DESTDIR)$(MANPATH)/man3
+	-@if [ ! -d $(DESTDIR)$(MANPATH)/man5 ]; then \
+	mkdir $(DESTDIR)$(MANPATH)/man5; fi
+	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man5/png.5
+	cp png.5 $(DESTDIR)$(MANPATH)/man5
+
+install-config: scripts/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)
+
+install: install-static install-shared install-man install-config
 
 clean:
 	/bin/rm -f *.o libpng.a $(LIBNAME).sl $(LIBNAME).sl.$(PNGMAJ)* \
diff --git a/scripts/makefile.linux b/scripts/makefile.linux
index 285a03a66..c5ff7a731 100644
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -5,7 +5,7 @@
 
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.3rc3
+PNGMIN = 1.2.3rc4
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 CC=gcc
@@ -42,6 +42,7 @@ RANLIB=ranlib
 INCPATH=$(prefix)/include
 LIBPATH=$(prefix)/lib
 MANPATH=$(prefix)/man
+BINPATH=$(prefix)/bin
 
 # override DESTDIR= on the make install command line to easily support
 # installing into a temporary location.  Example:
@@ -135,24 +136,35 @@ 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/libpng.12.pc
+	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.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)
 
 install-man: libpng.3 libpngpf.3 png.5
-	-@if [ ! -d $(MANPATH) ]; then mkdir $(MANPATH); fi
-	-@if [ ! -d $(MANPATH)/man3 ]; then mkdir $(MANPATH)/man3; fi
-	-@/bin/rm -f $(MANPATH)/man3/libpng.3
-	-@/bin/rm -f $(MANPATH)/man3/libpngpf.3
-	cp libpng.3 $(MANPATH)/man3
-	cp libpngpf.3 $(MANPATH)/man3
-	-@if [ ! -d $(MANPATH)/man5 ]; then mkdir $(MANPATH)/man5; fi
-	-@/bin/rm -f $(MANPATH)/man5/png.5
-	cp png.5 $(MANPATH)/man5
-
-install: install-static install-shared install-man
+	-@if [ ! -d $(DESTDIR)$(MANPATH) ]; then mkdir $(DESTDIR)$(MANPATH); fi
+	-@if [ ! -d $(DESTDIR)$(MANPATH)/man3 ]; then \
+	mkdir $(DESTDIR)$(MANPATH)/man3; fi
+	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man3/libpng.3
+	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man3/libpngpf.3
+	cp libpng.3 $(DESTDIR)$(MANPATH)/man3
+	cp libpngpf.3 $(DESTDIR)$(MANPATH)/man3
+	-@if [ ! -d $(DESTDIR)$(MANPATH)/man5 ]; then \
+	mkdir $(DESTDIR)$(MANPATH)/man5; fi
+	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man5/png.5
+	cp png.5 $(DESTDIR)$(MANPATH)/man5
+
+install-config: scripts/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)
+
+install: install-static install-shared install-man install-config
 
 clean:
 	/bin/rm -f *.o libpng.a $(LIBNAME).so $(LIBNAME).so.$(PNMAJ)* \
diff --git a/scripts/makefile.macosx b/scripts/makefile.macosx
index a2ce05507..48ef7e3e0 100644
--- a/scripts/makefile.macosx
+++ b/scripts/makefile.macosx
@@ -17,7 +17,7 @@ ZLIBINC=../zlib
 CC=cc
 
 PNGMAJ = 0
-PNGMIN = 1.2.3rc3
+PNGMIN = 1.2.3rc4
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 CFLAGS=-fno-common -I$(ZLIBINC) -O # -g -DPNG_DEBUG=5
@@ -30,6 +30,7 @@ SHAREDLIB_POSTFIX=dylib
 INCPATH=$(prefix)/include
 LIBPATH=$(prefix)/lib
 MANPATH=$(prefix)/man
+BINPATH=$(prefix)/bin
 
 # override DESTDIR= on the make install command line to easily support
 # installing into a temporary location.  Example:
@@ -111,24 +112,35 @@ 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/libpng.12.pc
+	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.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)
 
 install-man: libpng.3 libpngpf.3 png.5
-	-@if [ ! -d $(MANPATH) ]; then mkdir $(MANPATH); fi
-	-@if [ ! -d $(MANPATH)/man3 ]; then mkdir $(MANPATH)/man3; fi
-	-@/bin/rm -f $(MANPATH)/man3/libpng.3
-	-@/bin/rm -f $(MANPATH)/man3/libpngpf.3
-	cp libpng.3 $(MANPATH)/man3
-	cp libpngpf.3 $(MANPATH)/man3
-	-@if [ ! -d $(MANPATH)/man5 ]; then mkdir $(MANPATH)/man5; fi
-	-@/bin/rm -f $(MANPATH)/man5/png.5
-	cp png.5 $(MANPATH)/man5
-
-install: install-static install-shared install-man
+	-@if [ ! -d $(DESTDIR)$(MANPATH) ]; then mkdir $(DESTDIR)$(MANPATH); fi
+	-@if [ ! -d $(DESTDIR)$(MANPATH)/man3 ]; then \
+	mkdir $(DESTDIR)$(MANPATH)/man3; fi
+	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man3/libpng.3
+	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man3/libpngpf.3
+	cp libpng.3 $(DESTDIR)$(MANPATH)/man3
+	cp libpngpf.3 $(DESTDIR)$(MANPATH)/man3
+	-@if [ ! -d $(DESTDIR)$(MANPATH)/man5 ]; then \
+	mkdir $(DESTDIR)$(MANPATH)/man5; fi
+	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man5/png.5
+	cp png.5 $(DESTDIR)$(MANPATH)/man5
+
+install-config: scripts/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)
+
+install: install-static install-shared install-man install-config
 
 clean:
 	rm -f *.o libpng.a pngtest pngout.png \
diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd
index f6dac300d..a1c61a499 100644
--- 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.3rc3
+SHLIB_MINOR=	1.2.3rc4
 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
diff --git a/scripts/makefile.netbsd b/scripts/makefile.netbsd
index 151f11cea..3593dca65 100644
--- 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.3rc3
+SHLIB_MINOR=	1.2.3rc4
 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
diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd
index 829c13c84..fdd830da5 100644
--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@@ -7,7 +7,7 @@ LIBDIR=	${PREFIX}/lib
 MANDIR= ${PREFIX}/man/cat
 
 SHLIB_MAJOR=	0
-SHLIB_MINOR=	1.2.3rc3
+SHLIB_MINOR=	1.2.3rc4
 
 LIB=	png
 SRCS=	png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \
diff --git a/scripts/makefile.sco b/scripts/makefile.sco
index f897bc189..c2c86cba6 100644
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -26,13 +26,14 @@ 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.3rc3
+PNGMIN = 1.2.3rc4
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12
 
 INCPATH=$(prefix)/include/libpng
 LIBPATH=$(prefix)/lib
 MANPATH=$(prefix)/man
+BINPATH=$(prefix)/bin
 
 # override DESTDIR= on the make install command line to easily support
 # installing into a temporary location.  Example:
@@ -119,24 +120,35 @@ 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/libpng.12.pc
+	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.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)
 
 install-man: libpng.3 libpngpf.3 png.5
-	-@if [ ! -d $(MANPATH) ]; then mkdir $(MANPATH); fi
-	-@if [ ! -d $(MANPATH)/man3 ]; then mkdir $(MANPATH)/man3; fi
-	-@/bin/rm -f $(MANPATH)/man3/libpng.3
-	-@/bin/rm -f $(MANPATH)/man3/libpngpf.3
-	cp libpng.3 $(MANPATH)/man3
-	cp libpngpf.3 $(MANPATH)/man3
-	-@if [ ! -d $(MANPATH)/man5 ]; then mkdir $(MANPATH)/man5; fi
-	-@/bin/rm -f $(MANPATH)/man5/png.5
-	cp png.5 $(MANPATH)/man5
-
-install: install-static install-shared install-man
+	-@if [ ! -d $(DESTDIR)$(MANPATH) ]; then mkdir $(DESTDIR)$(MANPATH); fi
+	-@if [ ! -d $(DESTDIR)$(MANPATH)/man3 ]; then \
+	mkdir $(DESTDIR)$(MANPATH)/man3; fi
+	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man3/libpng.3
+	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man3/libpngpf.3
+	cp libpng.3 $(DESTDIR)$(MANPATH)/man3
+	cp libpngpf.3 $(DESTDIR)$(MANPATH)/man3
+	-@if [ ! -d $(DESTDIR)$(MANPATH)/man5 ]; then \
+	mkdir $(DESTDIR)$(MANPATH)/man5; fi
+	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man5/png.5
+	cp png.5 $(DESTDIR)$(MANPATH)/man5
+
+install-config: scripts/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)
+
+install: install-static install-shared install-man install-config
 
 
 clean:
diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc
index 96a0f342d..766cfe3a5 100644
--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -36,7 +36,7 @@ LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm
 LDSHARED=CC $(ABI) -shared
 
 PNGMAJ = 0
-PNGMIN = 1.2.3rc3
+PNGMIN = 1.2.3rc4
 PNGVER = $(PNGMAJ).$(PNGMIN)
 # See "man dso" for info about shared objects
 LIBS=libpng12.so.$(PNGVER)
@@ -44,6 +44,7 @@ LIBNAME=libpng12
 INCPATH=$(prefix)/include
 LIBPATH=$(prefix)/lib32
 MANPATH=$(prefix)/man
+BINPATH=$(prefix)/bin
 
 # override DESTDIR= on the make install command line to easily support
 # installing into a temporary location.  Example:
@@ -120,24 +121,35 @@ 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/libpng.12.pc
+	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.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)
 
 install-man: libpng.3 libpngpf.3 png.5
-	-@if [ ! -d $(MANPATH) ]; then mkdir $(MANPATH); fi
-	-@if [ ! -d $(MANPATH)/man3 ]; then mkdir $(MANPATH)/man3; fi
-	-@/bin/rm -f $(MANPATH)/man3/libpng.3
-	-@/bin/rm -f $(MANPATH)/man3/libpngpf.3
-	cp libpng.3 $(MANPATH)/man3
-	cp libpngpf.3 $(MANPATH)/man3
-	-@if [ ! -d $(MANPATH)/man5 ]; then mkdir $(MANPATH)/man5; fi
-	-@/bin/rm -f $(MANPATH)/man5/png.5
-	cp png.5 $(MANPATH)/man5
-
-install: install-static install-shared install-man
+	-@if [ ! -d $(DESTDIR)$(MANPATH) ]; then mkdir $(DESTDIR)$(MANPATH); fi
+	-@if [ ! -d $(DESTDIR)$(MANPATH)/man3 ]; then \
+	mkdir $(DESTDIR)$(MANPATH)/man3; fi
+	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man3/libpng.3
+	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man3/libpngpf.3
+	cp libpng.3 $(DESTDIR)$(MANPATH)/man3
+	cp libpngpf.3 $(DESTDIR)$(MANPATH)/man3
+	-@if [ ! -d $(DESTDIR)$(MANPATH)/man5 ]; then \
+	mkdir $(DESTDIR)$(MANPATH)/man5; fi
+	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man5/png.5
+	cp png.5 $(DESTDIR)$(MANPATH)/man5
+
+install-config: scripts/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)
+
+install: install-static install-shared install-man install-config
 
 clean:
 	rm -f *.o libpng.a pngtest pngout.png
diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi
index 1f1fbd935..5cc3341fe 100644
--- a/scripts/makefile.sgi
+++ b/scripts/makefile.sgi
@@ -31,7 +31,7 @@ LDSHARED=cc $(ABI) -shared
 # See "man dso" for info about shared objects
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.3rc3
+PNGMIN = 1.2.3rc4
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 RANLIB=echo
@@ -41,6 +41,8 @@ INCPATH=$(prefix)/include
 LIBPATH=$(prefix)/lib
 #LIBPATH=$(prefix)/lib32
 MANPATH=$(prefix)/man
+BINPATH=$(prefix)/bin
+BINPATH=$(prefix)/bin
 
 # override DESTDIR= on the make install command line to easily support
 # installing into a temporary location.  Example:
@@ -115,25 +117,35 @@ 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/libpng.12.pc
+	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.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)
 
 install-man: libpng.3 libpngpf.3 png.5
-	-@if [ ! -d $(MANPATH) ]; then mkdir $(MANPATH); fi
-	-@if [ ! -d $(MANPATH)/man3 ]; then mkdir $(MANPATH)/man3; fi
-	-@/bin/rm -f $(MANPATH)/man3/libpng.3
-	-@/bin/rm -f $(MANPATH)/man3/libpngpf.3
-	cp libpng.3 $(MANPATH)/man3
-	cp libpngpf.3 $(MANPATH)/man3
-	-@if [ ! -d $(MANPATH)/man5 ]; then mkdir $(MANPATH)/man5; fi
-	-@/bin/rm -f $(MANPATH)/man5/png.5
-	cp png.5 $(MANPATH)/man5
-
-install: install-static install-shared install-man
-
+	-@if [ ! -d $(DESTDIR)$(MANPATH) ]; then mkdir $(DESTDIR)$(MANPATH); fi
+	-@if [ ! -d $(DESTDIR)$(MANPATH)/man3 ]; then \
+	mkdir $(DESTDIR)$(MANPATH)/man3; fi
+	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man3/libpng.3
+	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man3/libpngpf.3
+	cp libpng.3 $(DESTDIR)$(MANPATH)/man3
+	cp libpngpf.3 $(DESTDIR)$(MANPATH)/man3
+	-@if [ ! -d $(DESTDIR)$(MANPATH)/man5 ]; then \
+	mkdir $(DESTDIR)$(MANPATH)/man5; fi
+	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man5/png.5
+	cp png.5 $(DESTDIR)$(MANPATH)/man5
+
+install-config: scripts/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)
+
+install: install-static install-shared install-man install-config
 
 clean:
 	rm -f *.o libpng.a pngtest pngout.png $(LIBNAME).so \
diff --git a/scripts/makefile.so9 b/scripts/makefile.so9
index f97788e58..4162eb6b3 100644
--- a/scripts/makefile.so9
+++ b/scripts/makefile.so9
@@ -36,13 +36,14 @@ 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.3rc3
+PNGMIN = 1.2.3rc4
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12
 
 INCPATH=$(prefix)/include
 LIBPATH=$(prefix)/lib
 MANPATH=$(prefix)/man
+BINPATH=$(prefix)/bin
 
 # override DESTDIR= on the make install command line to easily support
 # installing into a temporary location.  Example:
@@ -138,24 +139,35 @@ 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/libpng.12.pc
+	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.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)
 
 install-man: libpng.3 libpngpf.3 png.5
-	-@if [ ! -d $(MANPATH) ]; then mkdir $(MANPATH); fi
-	-@if [ ! -d $(MANPATH)/man3 ]; then mkdir $(MANPATH)/man3; fi
-	-@/bin/rm -f $(MANPATH)/man3/libpng.3
-	-@/bin/rm -f $(MANPATH)/man3/libpngpf.3
-	cp libpng.3 $(MANPATH)/man3
-	cp libpngpf.3 $(MANPATH)/man3
-	-@if [ ! -d $(MANPATH)/man5 ]; then mkdir $(MANPATH)/man5; fi
-	-@/bin/rm -f $(MANPATH)/man5/png.5
-	cp png.5 $(MANPATH)/man5
-
-install: install-static install-shared install-man
+	-@if [ ! -d $(DESTDIR)$(MANPATH) ]; then mkdir $(DESTDIR)$(MANPATH); fi
+	-@if [ ! -d $(DESTDIR)$(MANPATH)/man3 ]; then \
+	mkdir $(DESTDIR)$(MANPATH)/man3; fi
+	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man3/libpng.3
+	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man3/libpngpf.3
+	cp libpng.3 $(DESTDIR)$(MANPATH)/man3
+	cp libpngpf.3 $(DESTDIR)$(MANPATH)/man3
+	-@if [ ! -d $(DESTDIR)$(MANPATH)/man5 ]; then \
+	mkdir $(DESTDIR)$(MANPATH)/man5; fi
+	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man5/png.5
+	cp png.5 $(DESTDIR)$(MANPATH)/man5
+
+install-config: scripts/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)
+
+install: install-static install-shared install-man install-config
 
 
 clean:
diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris
index 88b42474e..1ed99225c 100644
--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -32,13 +32,14 @@ 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.3rc3
+PNGMIN = 1.2.3rc4
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12
 
 INCPATH=$(prefix)/include
 LIBPATH=$(prefix)/lib
 MANPATH=$(prefix)/man
+BINPATH=$(prefix)/bin
 
 # override DESTDIR= on the make install command line to easily support
 # installing into a temporary location.  Example:
@@ -134,24 +135,35 @@ 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/libpng.12.pc
+	-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.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)
 
 install-man: libpng.3 libpngpf.3 png.5
-	-@if [ ! -d $(MANPATH) ]; then mkdir $(MANPATH); fi
-	-@if [ ! -d $(MANPATH)/man3 ]; then mkdir $(MANPATH)/man3; fi
-	-@/bin/rm -f $(MANPATH)/man3/libpng.3
-	-@/bin/rm -f $(MANPATH)/man3/libpngpf.3
-	cp libpng.3 $(MANPATH)/man3
-	cp libpngpf.3 $(MANPATH)/man3
-	-@if [ ! -d $(MANPATH)/man5 ]; then mkdir $(MANPATH)/man5; fi
-	-@/bin/rm -f $(MANPATH)/man5/png.5
-	cp png.5 $(MANPATH)/man5
-
-install: install-static install-shared install-man
+	-@if [ ! -d $(DESTDIR)$(MANPATH) ]; then mkdir $(DESTDIR)$(MANPATH); fi
+	-@if [ ! -d $(DESTDIR)$(MANPATH)/man3 ]; then \
+	mkdir $(DESTDIR)$(MANPATH)/man3; fi
+	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man3/libpng.3
+	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man3/libpngpf.3
+	cp libpng.3 $(DESTDIR)$(MANPATH)/man3
+	cp libpngpf.3 $(DESTDIR)$(MANPATH)/man3
+	-@if [ ! -d $(DESTDIR)$(MANPATH)/man5 ]; then \
+	mkdir $(DESTDIR)$(MANPATH)/man5; fi
+	-@/bin/rm -f $(DESTDIR)$(MANPATH)/man5/png.5
+	cp png.5 $(DESTDIR)$(MANPATH)/man5
+
+install-config: scripts/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)
+
+install: install-static install-shared install-man install-config
 
 clean:
 	/bin/rm -f *.o libpng.a $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \
diff --git a/scripts/pngdef.pas b/scripts/pngdef.pas
index 7851a0e73..2adf4cd93 100644
--- a/scripts/pngdef.pas
+++ b/scripts/pngdef.pas
@@ -7,7 +7,7 @@ unit pngdef;
 interface
 
 const
-  PNG_LIBPNG_VER_STRING = '1.2.3rc3';
+  PNG_LIBPNG_VER_STRING = '1.2.3rc4';
   PNG_LIBPNG_VER        =  10203;
 
 type
diff --git a/scripts/pngos2.def b/scripts/pngos2.def
index b2a29d651..65449d7be 100644
--- a/scripts/pngos2.def
+++ b/scripts/pngos2.def
@@ -2,7 +2,7 @@
 ; PNG.LIB module definition file for OS/2
 ;----------------------------------------
 
-; Version 1.2.3rc3
+; Version 1.2.3rc4
 
 LIBRARY		PNG
 DESCRIPTION	"PNG image compression library for OS/2"
@@ -202,8 +202,8 @@ EXPORTS
   png_zfree
 
 ; Added at version 1.2.3
-  png_default_read
-  png_default_write
+  png_default_read_data
+  png_default_write_data
   png_default_flush
   png_push_fill_buffer