[master] Imported from libpng-1.2.42beta01.tar
diff --git a/ANNOUNCE b/ANNOUNCE
index f7bbd78..6f486c3 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -47,7 +47,9 @@
     to pngconf.h in version 1.2.41.
   Revised scripts/makefile.netbsd, makefile.openbsd, and makefile.sco
     to put png.h and pngconf.h in $prefix/include, like the other scripts,
-    instead of in $prefix/include/libpng.
+    instead of in $prefix/include/libpng.  Also revised makefile.sco
+    to put them in $prefix/include/libpng12 instead of in
+    $prefix/include/libpng/libpng12.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 
diff --git a/CHANGES b/CHANGES
index 95c502a..d9ccd04 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2610,7 +2610,9 @@
     to pngconf.h in version 1.2.41.
   Revised scripts/makefile.netbsd, makefile.openbsd, and makefile.sco
     to put png.h and pngconf.h in $prefix/include, like the other scripts,
-    instead of in $prefix/include/libpng.
+    instead of in $prefix/include/libpng.  Also revised makefile.sco
+    to put them in $prefix/include/libpng12 instead of in
+    $prefix/include/libpng/libpng12.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit