From ff649a071094284ea012a32defd826ff6ea4f4b9 Mon Sep 17 00:00:00 2001
From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
Date: Thu, 7 Aug 2014 19:51:35 -0500
Subject: [PATCH] [libpng16] Eliminated use of "$<" when copying
 $PNGLIBCONF_H_PREBUILT in

makefiles. This does not work on some versions of make; bug introduced in
libpng version 1.6.11.
---
 ANNOUNCE                     | 9 +++++++--
 CHANGES                      | 7 ++++++-
 scripts/makefile.atari       | 2 +-
 scripts/makefile.bc32        | 2 +-
 scripts/makefile.beos        | 2 +-
 scripts/makefile.bor         | 2 +-
 scripts/makefile.darwin      | 2 +-
 scripts/makefile.dec         | 2 +-
 scripts/makefile.dj2         | 2 +-
 scripts/makefile.freebsd     | 2 +-
 scripts/makefile.gcc         | 2 +-
 scripts/makefile.hp64        | 2 +-
 scripts/makefile.hpux        | 2 +-
 scripts/makefile.ibmc        | 2 +-
 scripts/makefile.intel       | 2 +-
 scripts/makefile.knr         | 2 +-
 scripts/makefile.linux       | 2 +-
 scripts/makefile.mips        | 2 +-
 scripts/makefile.msc         | 2 +-
 scripts/makefile.msys        | 2 +-
 scripts/makefile.ne12bsd     | 2 +-
 scripts/makefile.netbsd      | 2 +-
 scripts/makefile.openbsd     | 2 +-
 scripts/makefile.sco         | 2 +-
 scripts/makefile.sggcc       | 2 +-
 scripts/makefile.sgi         | 2 +-
 scripts/makefile.so9         | 2 +-
 scripts/makefile.solaris     | 2 +-
 scripts/makefile.solaris-x86 | 2 +-
 scripts/makefile.sunos       | 2 +-
 scripts/makefile.tc3         | 2 +-
 scripts/makefile.vcwin32     | 2 +-
 32 files changed, 43 insertions(+), 33 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index 80b86b26f..a34faa04a 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,4 +1,4 @@
-Libpng 1.6.13beta04 - August 4, 2014
+Libpng 1.6.13beta04 - August 8, 2014
 
 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.
@@ -50,7 +50,12 @@ Version 1.6.13beta03 [August 3, 2014]
   Ensure that CMakeLists.txt makes the target "lib" directory before making
     symbolic link into it (SourceForge bug report #226 by Rolf Timmermans).
 
-Version 1.6.13beta04 [August 4, 2014]
+Version 1.6.13beta04 [August 8, 2014]
+  Added opinion about the ECCN (Export Control Classification Number) for
+    libpng being EAR99 to README
+  Eliminated use of "$<" in makefiles, when copying $PNGLIBCONF_H_PREBUILT.
+    This does not work on some versions of make; bug introduced in libpng
+    version 1.6.11.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 8a127cf4d..3a3db79c6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4965,7 +4965,12 @@ Version 1.6.13beta03 [August 3, 2014]
   Ensure that CMakeLists.txt makes the target "lib" directory before making
     symbolic link into it (SourceForge bug report #226 by Rolf Timmermans).
 
-Version 1.6.13beta04 [August 4, 2014]
+Version 1.6.13beta04 [August 8, 2014]
+  Added opinion about the ECCN (Export Control Classification Number) for
+    libpng being EAR99 to README
+  Eliminated use of "$<" in makefiles, when copying $PNGLIBCONF_H_PREBUILT.
+    This does not work on some versions of make; bug introduced in libpng
+    version 1.6.11.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/scripts/makefile.atari b/scripts/makefile.atari
index d0aa4813d..b5dbd4934 100644
--- a/scripts/makefile.atari
+++ b/scripts/makefile.atari
@@ -49,7 +49,7 @@ $(LBR): $(OBJS)
 $(OBJS): pngpriv.h png.h pngconf.h pnglibconf.h pnginfo.h pngstruct.h pngdebug.h
 
 pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
-	cp $< $@
+	cp $(PNGLIBCONF_H_PREBUILT) $@
 
 pngtest.ttp: pngtest.o $(LBR)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o$@ pngtest.o
diff --git a/scripts/makefile.bc32 b/scripts/makefile.bc32
index cefbef005..d488a54a0 100644
--- a/scripts/makefile.bc32
+++ b/scripts/makefile.bc32
@@ -117,7 +117,7 @@ test: pngtest.exe
 ## Minor Targets
 
 pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
-	$(CP) $< $@
+	$(CP) $(PNGLIBCONF_H_PREBUILT) $@
 
 png.obj: png.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
 pngerror.obj: pngerror.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
diff --git a/scripts/makefile.beos b/scripts/makefile.beos
index edac36529..01346f190 100644
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -87,7 +87,7 @@ OBJSDLL = $(OBJS)
 all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
 
 pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
-	$(CP) $< $@
+	$(CP) $(PNGLIBCONF_H_PREBUILT) $@
 
 libpng.a: $(OBJS)
 	$(AR_RC) $@ $(OBJS)
diff --git a/scripts/makefile.bor b/scripts/makefile.bor
index c4eed602c..a01f73899 100644
--- a/scripts/makefile.bor
+++ b/scripts/makefile.bor
@@ -117,7 +117,7 @@ all: libpng pngtest
 
 # try !include scripts\pnglibconf.mak for more options
 pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
-	$(CP) $< $@
+	$(CP) $(PNGLIBCONF_H_PREBUILT) $@
 
 libpng: $(LIBNAME)
 
diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin
index fd6adff5b..fdc744d92 100644
--- a/scripts/makefile.darwin
+++ b/scripts/makefile.darwin
@@ -84,7 +84,7 @@ OBJSDLL = $(OBJS:.o=.pic.o)
 all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
 
 pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
-	$(CP) $< $@
+	$(CP) $(PNGLIBCONF_H_PREBUILT) $@
 
 libpng.a: $(OBJS)
 	$(AR_RC) $@ $(OBJS)
diff --git a/scripts/makefile.dec b/scripts/makefile.dec
index 54cbcacca..8566a0297 100644
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -72,7 +72,7 @@ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
 all: $(LIBSO) libpng.a pngtest libpng.pc libpng-config
 
 pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
-	$(CP) $< $@
+	$(CP) $(PNGLIBCONF_H_PREBUILT) $@
 
 libpng.a: $(OBJS)
 	$(AR_RC) $@  $(OBJS)
diff --git a/scripts/makefile.dj2 b/scripts/makefile.dj2
index e21546d6f..e59c432b4 100644
--- a/scripts/makefile.dj2
+++ b/scripts/makefile.dj2
@@ -36,7 +36,7 @@ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
 all: libpng.a pngtest
 
 pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
-	$(CP) $< $@
+	$(CP) $(PNGLIBCONF_H_PREBUILT) $@
 
 libpng.a: $(OBJS)
 	ar rc $@  $(OBJS)
diff --git a/scripts/makefile.freebsd b/scripts/makefile.freebsd
index c0084354f..cad1a5aa8 100644
--- a/scripts/makefile.freebsd
+++ b/scripts/makefile.freebsd
@@ -60,7 +60,7 @@ test: pngtest
 	./pngtest
 
 pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
-	cp $< $@
+	cp $(PNGLIBCONF_H_PREBUILT) $@
 
 DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
 writelock:
diff --git a/scripts/makefile.gcc b/scripts/makefile.gcc
index 8811a28a4..ba92d1509 100644
--- a/scripts/makefile.gcc
+++ b/scripts/makefile.gcc
@@ -43,7 +43,7 @@ OBJS =  png.o pngerror.o pngget.o pngmem.o pngpread.o \
 all: static
 
 pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
-	$(CP) $< $@
+	$(CP) $(PNGLIBCONF_H_PREBUILT) $@
 
 .c.o:
 	$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64
index 2883d6570..36f91e403 100644
--- a/scripts/makefile.hp64
+++ b/scripts/makefile.hp64
@@ -89,7 +89,7 @@ OBJSDLL = $(OBJS:.o=.pic.o)
 all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
 
 pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
-	$(CP) $< $@
+	$(CP) $(PNGLIBCONF_H_PREBUILT) $@
 
 libpng.a: $(OBJS)
 	$(AR_RC) $@ $(OBJS)
diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux
index 2a4a0b3db..079710773 100644
--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -87,7 +87,7 @@ OBJSDLL = $(OBJS:.o=.pic.o)
 all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
 
 pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
-	$(CP) $< $@
+	$(CP) $(PNGLIBCONF_H_PREBUILT) $@
 
 libpng.a: $(OBJS)
 	$(AR_RC) $@ $(OBJS)
diff --git a/scripts/makefile.ibmc b/scripts/makefile.ibmc
index 2f5a03cae..89b11966b 100644
--- a/scripts/makefile.ibmc
+++ b/scripts/makefile.ibmc
@@ -51,7 +51,7 @@ LIBS = libpng$(A) $(ZLIBLIB)/zlib$(A)
 all: libpng$(A) pngtest$(E)
 
 pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
-	$(CP) $< $@
+	$(CP) $(PNGLIBCONF_H_PREBUILT) $@
 
 libpng$(A): $(OBJS)
 	$(AR) -out:$@ $(OBJS)
diff --git a/scripts/makefile.intel b/scripts/makefile.intel
index 5e752ae2e..418726159 100644
--- a/scripts/makefile.intel
+++ b/scripts/makefile.intel
@@ -51,7 +51,7 @@ pngrtran$(O) pngwtran$(O) pngrio$(O) pngwio$(O)
 all: test
 
 pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
-	$(CP) $< $@
+	$(CP) $(PNGLIBCONF_H_PREBUILT) $@
 
 png$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
 	$(CC) $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
diff --git a/scripts/makefile.knr b/scripts/makefile.knr
index 38a67cb80..d8de064c4 100644
--- a/scripts/makefile.knr
+++ b/scripts/makefile.knr
@@ -50,7 +50,7 @@ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
 all: ansi2knr libpng.a pngtest
 
 pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
-	$(CP) $< $@
+	$(CP) $(PNGLIBCONF_H_PREBUILT) $@
 
 # general rule to allow ansi2knr to work
 .c.o:
diff --git a/scripts/makefile.linux b/scripts/makefile.linux
index 12598face..a595cf8e3 100644
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -97,7 +97,7 @@ OBJSDLL = $(OBJS:.o=.pic.o)
 all: libpng.a $(LIBSO) pngtest pngtest-static libpng.pc libpng-config
 
 pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
-	$(CP) $< $@
+	$(CP) $(PNGLIBCONF_H_PREBUILT) $@
 
 libpng.a: $(OBJS)
 	$(AR_RC) $@ $(OBJS)
diff --git a/scripts/makefile.mips b/scripts/makefile.mips
index d171dc411..5633608c8 100644
--- a/scripts/makefile.mips
+++ b/scripts/makefile.mips
@@ -46,7 +46,7 @@ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
 all: libpng.a pngtest
 
 pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
-	$(CP) $< $@
+	$(CP) $(PNGLIBCONF_H_PREBUILT) $@
 
 libpng.a: $(OBJS)
 	ar rc $@  $(OBJS)
diff --git a/scripts/makefile.msc b/scripts/makefile.msc
index c3806440a..539d62e94 100644
--- a/scripts/makefile.msc
+++ b/scripts/makefile.msc
@@ -34,7 +34,7 @@ OBJS3 = pngrtran$(O) pngwtran$(O) pngrio$(O) pngwio$(O)
 all: libpng.lib
 
 pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
-	$(CP) $< $@
+	$(CP) $(PNGLIBCONF_H_PREBUILT) $@
 
 png$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
 	$(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
diff --git a/scripts/makefile.msys b/scripts/makefile.msys
index 5cc3b0860..a10b79ae9 100644
--- a/scripts/makefile.msys
+++ b/scripts/makefile.msys
@@ -87,7 +87,7 @@ OBJS =  png.o pngerror.o pngget.o pngmem.o pngpread.o \
 all: static shared
 
 pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
-	$(CP) $< $@
+	$(CP) $(PNGLIBCONF_H_PREBUILT) $@
 
 .c.o:
 	$(CC) -c $(CPPFLAGS) $(CFLAGS) $<
diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd
index bd0396896..be6066ea5 100644
--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -42,7 +42,7 @@ CLEANFILES+=pngtest.o pngtest pnglibconf.h
 	$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
 
 pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
-	cp $< $@
+	cp $(PNGLIBCONF_H_PREBUILT) $@
 
 pngtest.o:	pngtest.c
 	${CC} -c ${CPPFLAGS} ${CFLAGS} ${.ALLSRC} -o ${.TARGET}
diff --git a/scripts/makefile.netbsd b/scripts/makefile.netbsd
index 1bee02bf2..e3b39bb1e 100644
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -42,7 +42,7 @@ CLEANFILES+=pngtest.o pngtest pnglibconf.h
 	$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
 
 pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
-	cp $< $@
+	cp $(PNGLIBCONF_H_PREBUILT) $@
 
 pngtest.o:	pngtest.c
 	${CC} -c ${CPPFLAGS} ${CFLAGS} ${.ALLSRC} -o ${.TARGET}
diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd
index f80baf2ff..38bb2d59a 100644
--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@@ -39,7 +39,7 @@ PNGLIBCONF_H_PREBUILT= scripts/pnglibconf.h.prebuilt
 	$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
 
 pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
-	cp $< $@
+	cp $(PNGLIBCONF_H_PREBUILT) $@
 
 pngtest.o:	pngtest.c
 	${CC} ${CPPFLAGS} ${CFLAGS} -c ${.ALLSRC} -o ${.TARGET}
diff --git a/scripts/makefile.sco b/scripts/makefile.sco
index 6e5457dac..b9c7c402b 100644
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -83,7 +83,7 @@ OBJSDLL = $(OBJS:.o=.pic.o)
 all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
 
 pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
-	$(CP) $< $@
+	$(CP) $(PNGLIBCONF_H_PREBUILT) $@
 
 libpng.a: $(OBJS)
 	$(AR_RC) $@ $(OBJS)
diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc
index f8721c9b9..a0d051dbd 100644
--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -86,7 +86,7 @@ OBJS =  png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
 all: libpng.a pngtest shared libpng.pc libpng-config
 
 pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
-	$(CP) $< $@
+	$(CP) $(PNGLIBCONF_H_PREBUILT) $@
 
 libpng.a: $(OBJS)
 	$(AR_RC) $@ $(OBJS)
diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi
index 561ce8385..7df090222 100644
--- a/scripts/makefile.sgi
+++ b/scripts/makefile.sgi
@@ -89,7 +89,7 @@ OBJS =  png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
 all: libpng.a pngtest shared libpng.pc libpng-config
 
 pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
-	$(CP) $< $@
+	$(CP) $(PNGLIBCONF_H_PREBUILT) $@
 
 libpng.a: $(OBJS)
 	$(AR_RC) $@ $(OBJS)
diff --git a/scripts/makefile.so9 b/scripts/makefile.so9
index 9102e6926..ba9308c8a 100644
--- a/scripts/makefile.so9
+++ b/scripts/makefile.so9
@@ -93,7 +93,7 @@ OBJSDLL = $(OBJS:.o=.pic.o)
 all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
 
 pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
-	$(CP) $< $@
+	$(CP) $(PNGLIBCONF_H_PREBUILT) $@
 
 libpng.a: $(OBJS)
 	$(AR_RC) $@ $(OBJS)
diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris
index 879e6a46b..8a450d371 100644
--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -89,7 +89,7 @@ OBJSDLL = $(OBJS:.o=.pic.o)
 all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
 
 pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
-	$(CP) $< $@
+	$(CP) $(PNGLIBCONF_H_PREBUILT) $@
 
 libpng.a: $(OBJS)
 	$(AR_RC) $@ $(OBJS)
diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86
index 509d5a393..b6d24375d 100644
--- a/scripts/makefile.solaris-x86
+++ b/scripts/makefile.solaris-x86
@@ -88,7 +88,7 @@ OBJSDLL = $(OBJS:.o=.pic.o)
 all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
 
 pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
-	$(CP) $< $@
+	$(CP) $(PNGLIBCONF_H_PREBUILT) $@
 
 libpng.a: $(OBJS)
 	$(AR_RC) $@ $(OBJS)
diff --git a/scripts/makefile.sunos b/scripts/makefile.sunos
index df661bf83..efe308c47 100644
--- a/scripts/makefile.sunos
+++ b/scripts/makefile.sunos
@@ -58,7 +58,7 @@ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
 all: libpng.a pngtest
 
 pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
-	$(CP) $< $@
+	$(CP) $(PNGLIBCONF_H_PREBUILT) $@
 
 libpng.a: $(OBJS)
 	$(AR_RC) $@  $(OBJS)
diff --git a/scripts/makefile.tc3 b/scripts/makefile.tc3
index c921f8465..c917a08f1 100644
--- a/scripts/makefile.tc3
+++ b/scripts/makefile.tc3
@@ -32,7 +32,7 @@ OBJSL3 = +pngwrite$(O) +pngrtran$(O) +pngwtran$(O) +pngrio$(O) +pngwio$(O)
 all: libpng$(MODEL).lib pngtest$(E)
 
 pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
-	$(CP) $< $@
+	$(CP) $(PNGLIBCONF_H_PREBUILT) $@
 
 pngtest: pngtest$(E)
 
diff --git a/scripts/makefile.vcwin32 b/scripts/makefile.vcwin32
index 794e6401a..621969239 100644
--- a/scripts/makefile.vcwin32
+++ b/scripts/makefile.vcwin32
@@ -42,7 +42,7 @@ OBJS  = $(OBJS1) $(OBJS2) $(OBJS3)
 all: libpng.lib
 
 pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
-       $(CP) $< $@
+	$(CP) $(PNGLIBCONF_H_PREBUILT) $@
 
 png$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
 	$(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)