[libpng16] The macros passed in the command line to Borland make were ignored if
similarly-named macros were already defined in makefiles. This behavior
is different from POSIX make and other make programs. Surround the
macro definitions with ifndef guards (Cosmin).
diff --git a/scripts/makefile.bc32 b/scripts/makefile.bc32
index d488a54..bdbc4cb 100644
--- a/scripts/makefile.bc32
+++ b/scripts/makefile.bc32
@@ -52,7 +52,9 @@
# Pre-built configuration
# See scripts\pnglibconf.mak for more options
+!ifndef PNGLIBCONF_H_PREBUILT
PNGLIBCONF_H_PREBUILT = scripts\pnglibconf.h.prebuilt
+!endif
## Variables
OBJS = \
diff --git a/scripts/makefile.bor b/scripts/makefile.bor
index a01f738..6693772 100644
--- a/scripts/makefile.bor
+++ b/scripts/makefile.bor
@@ -60,7 +60,9 @@
# Pre-built configuration
# See scripts\pnglibconf.mak for more options
+!ifndef PNGLIBCONF_H_PREBUILT
PNGLIBCONF_H_PREBUILT = scripts\pnglibconf.h.prebuilt
+!endif
## Variables
diff --git a/scripts/makefile.tc3 b/scripts/makefile.tc3
index c917a08..1d01502 100644
--- a/scripts/makefile.tc3
+++ b/scripts/makefile.tc3
@@ -16,7 +16,9 @@
# Pre-built configuration
# See scripts\pnglibconf.mak for more options
+!ifndef PNGLIBCONF_H_PREBUILT
PNGLIBCONF_H_PREBUILT = scripts\pnglibconf.h.prebuilt
+!endif
O=.obj
E=.exe
