From 2f2f80273b2d1b1451e7d9d3e2a8dd8dbab7ab87 Mon Sep 17 00:00:00 2001
From: Glenn Randers-Pehrson <glennrp@shaggy.simplesystems.org>
Date: Wed, 6 Jan 2010 17:39:57 -0600
Subject: [PATCH] [master] Undid recent change to the Makefiles.

People don't need libpng.so.NN
---
 ANNOUNCE    | 6 ++----
 CHANGES     | 6 ++----
 Makefile.am | 2 +-
 Makefile.in | 2 +-
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index 280920362..56ab2c6b9 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -31,10 +31,8 @@ version 1.4.1beta01 [January 6, 2010]
     unclosed if-statement warning (Philip Lowman).
   Revised Makefile.am and Makefile.in to remove references to Y2KINFO,
     KNOWNBUG, and libpng.la (Robert Schwebel).
-  Revised Makefile.am and Makefile.in to make libpng.so.14, libpng.sl.14,
-    and libpng.14.dylib links in the installed library directory.
-  Revised scripts/makefile.linux to make the same files as configure,
-    except for libpng.la and libpng14.la.
+  Revised scripts/makefile.linux to install the same files and symbolic
+    links as configure, except for libpng.la and libpng14.la.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 0d19716c2..2b3e5347a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2463,10 +2463,8 @@ version 1.4.1beta01 [January 6, 2010]
     unclosed if-statement warning (Philip Lowman).
   Revised Makefile.am and Makefile.in to remove references to Y2KINFO,
     KNOWNBUG, and libpng.la (Robert Schwebel).
-  Revised Makefile.am and Makefile.in to make libpng.so.14, libpng.sl.14,
-    and libpng.14.dylib links in the installed library directory.
-  Revised scripts/makefile.linux to make the same files as configure,
-    except for libpng.la and libpng14.la.
+  Revised scripts/makefile.linux to install the same files and symbolic
+    links as configure, except for libpng.la and libpng14.la.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/Makefile.am b/Makefile.am
index a3ea6f3aa..1d4973fc0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -127,7 +127,7 @@ install-exec-hook:
 	cd $(DESTDIR)$(bindir); $(LN_S) $(PNGLIB_BASENAME)-config libpng-config
 	@set -x;\
 	cd $(DESTDIR)$(libdir);\
-	for ext in a la so so.14 sl sl.14 dylib 14.dylib; do\
+	for ext in a la so sl dylib; do\
 		rm -f libpng.$$ext;\
                 if test -f $(PNGLIB_BASENAME).$$ext; then\
                        $(LN_S) $(PNGLIB_BASENAME).$$ext libpng.$$ext;\
diff --git a/Makefile.in b/Makefile.in
index 52f0bff63..0cbcde224 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1238,7 +1238,7 @@ install-exec-hook:
 	cd $(DESTDIR)$(bindir); $(LN_S) $(PNGLIB_BASENAME)-config libpng-config
 	@set -x;\
 	cd $(DESTDIR)$(libdir);\
-	for ext in a la so so.14 sl sl.14 dylib 14.dylib; do\
+	for ext in a la so sl dylib; do\
 		rm -f libpng.$$ext;\
                 if test -f $(PNGLIB_BASENAME).$$ext; then\
                        $(LN_S) $(PNGLIB_BASENAME).$$ext libpng.$$ext;\