DO NOT MERGE Update libpng to 1.6.20
BUG:23265085
Change-Id: I85199805636d771f3597b691b63bc0bf46084833
(cherry picked from commit bbe98b40cda082024b669fa508931042eed18f82)
diff --git a/scripts/makefile.bor b/scripts/makefile.bor
index a032510..6693772 100644
--- a/scripts/makefile.bor
+++ b/scripts/makefile.bor
@@ -12,10 +12,11 @@
## Where zlib.h, zconf.h and zlib_MODEL.lib are
ZLIB_DIR=..\zlib
-## Compiler, linker and lib stuff
+## Compiler, linker, librarian and other tools
CC=bcc
LD=bcc
LIB=tlib
+CP=copy
!ifndef MODEL
MODEL=l
@@ -57,6 +58,12 @@
# -M generate map file
LDFLAGS=-M -L$(ZLIB_DIR) $(MODEL_ARG) $(LDEBUG)
+# Pre-built configuration
+# See scripts\pnglibconf.mak for more options
+!ifndef PNGLIBCONF_H_PREBUILT
+PNGLIBCONF_H_PREBUILT = scripts\pnglibconf.h.prebuilt
+!endif
+
## Variables
OBJS = \
@@ -110,9 +117,9 @@
all: libpng pngtest
-# try !inlude scripts\pnglibconf.mak for more options
-pnglibconf.h: scripts\pnglibconf.h.prebuilt
- copy scripts\pnglibconf.h.prebuilt $@
+# try !include scripts\pnglibconf.mak for more options
+pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
+ $(CP) $(PNGLIBCONF_H_PREBUILT) $@
libpng: $(LIBNAME)