Commit 54a79c88546d57a1a1a305f4974a6ca9b3a353fe
2006-02-01T07:54:07
Use `?='.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53
diff --git a/ChangeLog b/ChangeLog
index 9b8e1e5..0ca7496 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,7 +9,8 @@
* builds/unix/install.mk (install): Fix path for ftmodule.h.
- * Makefile, *.mk: Use `?=' where appropriate.
+ * Makefile, *.mk, builds/unix/unix-cc.in, builds/unix-def.in: Use
+ `?=' where appropriate.
* builds/detect.mk (TOP_DIR), builds/os2/os2-dev.mk (TOP_DIR),
builds/win32/w32-dev.mk (TOP_DIR): Removed. Defined elsewhere.
diff --git a/builds/unix/unix-cc.in b/builds/unix/unix-cc.in
index d095bcb..76eebd7 100644
--- a/builds/unix/unix-cc.in
+++ b/builds/unix/unix-cc.in
@@ -2,7 +2,7 @@
# FreeType 2 template for Unix-specific compiler definitions
#
-# Copyright 1996-2000, 2002, 2003, 2005 by
+# Copyright 1996-2000, 2002, 2003, 2005, 2006 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@@ -15,9 +15,7 @@
CC := @CC@
COMPILER_SEP := $(SEP)
-ifndef LIBTOOL
- LIBTOOL := $(BUILD_DIR)/libtool
-endif
+LIBTOOL ?= $(BUILD_DIR)/libtool
# The object file extension (for standard and static libraries). This can be
diff --git a/builds/unix/unix-def.in b/builds/unix/unix-def.in
index 801bdaa..9a23b1c 100644
--- a/builds/unix/unix-def.in
+++ b/builds/unix/unix-def.in
@@ -20,9 +20,7 @@ DELDIR := @RMDIR@
SEP := /
# this is used for `make distclean' and `make install'
-ifndef OBJ_BUILD
- OBJ_BUILD := $(BUILD_DIR)
-endif
+OBJ_BUILD ?= $(BUILD_DIR)
# don't use `:=' here since the path stuff will be included after this file
#