summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMark Whitley <markw@lineo.com>2001-02-02 01:07:17 +0000
committerMark Whitley <markw@lineo.com>2001-02-02 01:07:17 +0000
commit76c5e60d54cb656c5602cc87b76cbb7f6a651ffd (patch)
tree5c7aaa819608981e4650aa62226f6fba3d62a6e1
parentaf4ac77d9d13f879922ccad8a8535c24aeea0380 (diff)
Patch from Chris Jaeger that makes turning on and off options in the makefile
a bit less error prone by calling 'strip' on makefile vars before performing truth tests against them.
-rw-r--r--Makefile12
1 files changed, 6 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 33dd1e113..a71ea68b4 100644
--- a/Makefile
+++ b/Makefile
@@ -101,18 +101,18 @@ OPTIMIZATION = $(shell if $(CC) -Os -S -o /dev/null -xc /dev/null >/dev/null 2>&
WARNINGS = -Wall
-ifeq ($(DOLFS),true)
+ifeq ($(strip $(DOLFS)),true)
# For large file summit support
CFLAGS+=-D_FILE_OFFSET_BITS=64
endif
-ifeq ($(DODMALLOC),true)
+ifeq ($(strip $(DODMALLOC)),true)
# For testing mem leaks with dmalloc
CFLAGS+=-DDMALLOC
LIBRARIES = -ldmalloc
# Force debug=true, since this is useless when not debugging...
DODEBUG = true
endif
-ifeq ($(DODEBUG),true)
+ifeq ($(strip $(DODEBUG)),true)
CFLAGS += $(WARNINGS) -g -D_GNU_SOURCE
LDFLAGS += -Wl,-warn-common
STRIP =
@@ -121,7 +121,7 @@ else
LDFLAGS += -s -Wl,-warn-common
STRIP = $(STRIPTOOL) --remove-section=.note --remove-section=.comment $(PROG)
endif
-ifeq ($(DOSTATIC),true)
+ifeq ($(strip $(DOSTATIC)),true)
LDFLAGS += --static
#
#use '-ffunction-sections -fdata-sections' and '--gc-sections' (if they
@@ -147,7 +147,7 @@ endif
#
# Work in progress by <ldoolitt@recycle.lbl.gov>.
# If it gets in your way, set DISABLE_VPATH=yes
-ifeq ($(DISABLE_VPATH),yes)
+ifeq ($(strip $(DISABLE_VPATH)),yes)
CONFIG_H = Config.h
else
VPATH = .:$(BB_SRC_DIR)
@@ -164,7 +164,7 @@ ifdef BB_INIT_SCRIPT
CFLAGS += -DINIT_SCRIPT='"$(BB_INIT_SCRIPT)"'
endif
-ifneq ($(USE_SYSTEM_PWD_GRP),true)
+ifneq ($(strip $(USE_SYSTEM_PWD_GRP)),true)
PWD_LIB = pwd_grp/libpwd.a
LIBRARIES += $(PWD_LIB)
else