FPII-2034: DO NOT MERGE Update libpng to 1.6.20
DO NOT MERGE Update libpng to 1.6.20
BUG:23265085
Change-Id: I2fc2106965c789a54f04412e9c63a0901b0c1e71
(cherry picked from commit 0b39f202aaedd3029e4270d2af7d58ba6634f9cd)
diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris
index 8132199..8a450d3 100644
--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -24,6 +24,7 @@
MKDIR_P=mkdir -p
LN_SF=ln -f -s
RANLIB=echo
+CP=cp
RM_F=/bin/rm -f
# Where make install puts libpng.a, libpng16.so*, and png.h
@@ -67,6 +68,10 @@
DL=$(DESTDIR)$(LIBPATH)
DM=$(DESTDIR)$(MANPATH)
+# Pre-built configuration
+# See scripts/pnglibconf.mak for more options
+PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt
+
OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
pngwtran.o pngmem.o pngerror.o pngpread.o
@@ -83,9 +88,8 @@
all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
-# see scripts/pnglibconf.mak for more options
-pnglibconf.h: scripts/pnglibconf.h.prebuilt
- cp scripts/pnglibconf.h.prebuilt $@
+pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
+ $(CP) $(PNGLIBCONF_H_PREBUILT) $@
libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS)