From 808100b1a76a8773c360e699d618b209af6c62cc Mon Sep 17 00:00:00 2001
From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
Date: Tue, 12 Jul 2011 06:28:57 -0500
Subject: [PATCH] [legacy] Reverted non-portable GNU syntax in makefile (?=,
 +=)

---
 ANNOUNCE                      | 6 +++---
 CHANGES                       | 3 ++-
 contrib/pngminus/makefile.std | 8 ++++----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index 80a9da0e..b87a487f 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.2.47beta01 - July 11, 2011
+Libpng 1.2.47beta01 - July 12, 2011
 
 This is not intended to be a public release.  It will be replaced
 within a few weeks by a public version or by another test version.
@@ -42,8 +42,8 @@ Other information:
 
 Changes since the last public release (1.2.46):
 
-version 1.2.47beta01 [July 11, 2011]
-  Updated contrib/pngminus/makefile.std
+version 1.2.47beta01 [July 12, 2011]
+  Updated contrib/pngminus/makefile.std (Samuli Souminen)
 
 (subscription required; visit
 https://lists.sourceforge.net/lists/listinfo/png-mng-implement
diff --git a/CHANGES b/CHANGES
index 43d21691..fe2b7099 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2736,8 +2736,9 @@ version 1.2.46rc02 and 1.0.56rc02 [July 8, 2011]
 version 1.2.46 and 1.0.56 [July 9, 2011]
   Udated copyright year to 2011.
 
-version 1.2.47beta01 [July 11, 2011]
+version 1.2.47beta01 [July 12, 2011]
   Updated contrib/pngminus/makefile.std
+  Updated contrib/pngminus/makefile.std (Samuli Souminen)
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/contrib/pngminus/makefile.std b/contrib/pngminus/makefile.std
index 1c283051..6a01daf1 100644
--- a/contrib/pngminus/makefile.std
+++ b/contrib/pngminus/makefile.std
@@ -1,9 +1,9 @@
 # Makefile for PngMinus (png2pnm and pnm2png)
 # Linux / Unix
 
-#CC?=cc
-CC?=gcc
-LD?=$(CC)
+#CC=cc
+CC=gcc
+LD=$(CC)
 
 RM=rm -f
 
@@ -23,7 +23,7 @@ ZINC = -I../../../zlib
 ZLIB = -L../../../zlib -lz
 ZLIBS = ../../../zlib/libz.a
 
-CFLAGS+=$(PNGINC) $(ZINC)
+CFLAGS=$(PNGINC) $(ZINC)
 LDLIBS=$(PNGLIB) $(ZLIB)
 LDLIBSS=$(PNGLIBS) $(ZLIBS)
 C=.c