Imported from libpng-1.0.5h.tar
diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris
index 054cd55..b796907 100644
--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -6,11 +6,16 @@
 
 CC=gcc
 
-# The commands "CC" and "LD" must NOT refer to /usr/ucb/cc and /usr/ucb/ld.
-# If they do, you need to adjust your PATH environment variable to put
-# /usr/ccs/bin ahead of /usr/ucb.  The environment variable LD_LIBRARY_PATH
-# should not be set at all.  If it is, things are likely to break because
-# of the libucb dependency that is created.
+case "`type ld`" in *ucb*) echo "
+# WARNING:
+# The commands "CC" and "LD" must NOT refer to /usr/ucb/cc and
+# /usr/ucb/ld.  If they do, you need to adjust your PATH environment
+# variable to put /usr/ccs/bin ahead of /usr/ucb.  The environment
+# variable LD_LIBRARY_PATH should not be set at all.  If it is,
+# things are likely to break because of the libucb dependency that
+# is created.
+" ;;
+esac
 
 # Where make install puts libpng.a, libpng.so*, and png.h
 prefix=/usr/local
@@ -37,7 +42,7 @@
 # read libpng.txt or png.h to see why PNGMAJ is 2.  You should not
 # have to change it.
 PNGMAJ = 2
-PNGMIN = 1.0.5d
+PNGMIN = 1.0.5h
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 INCPATH=$(prefix)/include
@@ -89,6 +94,10 @@
 clean:
 	/bin/rm -f *.o libpng.a libpng.so* pngtest pngout.png
 
+DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
+writelock:
+	chmod a-w *.[ch35] $(DOCS) scripts/*
+
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
 png.o png.pic.o: png.h pngconf.h