Makefile            | 32 ++++++++++++++++----------------
 misc/haiku/Makefile | 32 ++++++++++++++++----------------

diff --git a/Makefile b/Makefile
index 97f22ab31b116e479d2cc2fc7f48eeacb1874a15..057ae34df2fd9758d403c0a29b49c9937ec69367 100644
--- a/Makefile
+++ b/Makefile
@@ -38,65 +38,65 @@ 	O_NORL := 1
 	O_NOLOC := 1
 endif
 
-ifeq ($(O_DEBUG),1)
+ifeq ($(strip $(O_DEBUG)),1)
 	CPPFLAGS += -DDBGMODE
 	CFLAGS += -g
 endif
 
-ifeq ($(O_NORL),1)
+ifeq ($(strip $(O_NORL)),1)
 	CPPFLAGS += -DNORL
-else ifeq ($(O_STATIC),1)
+else ifeq ($(strip $(O_STATIC)),1)
 	CPPFLAGS += -DNORL
 else
 	LDLIBS += -lreadline
 endif
 
-ifeq ($(O_PCRE),1)
+ifeq ($(strip $(O_PCRE)),1)
 	CPPFLAGS += -DPCRE
 	LDLIBS += -lpcre
 endif
 
-ifeq ($(O_NOLOC),1)
+ifeq ($(strip $(O_NOLOC)),1)
 	CPPFLAGS += -DNOLOCALE
 endif
 
-ifeq ($(O_NOMOUSE),1)
+ifeq ($(strip $(O_NOMOUSE)),1)
 	CPPFLAGS += -DNOMOUSE
 endif
 
-ifeq ($(O_NOBATCH),1)
+ifeq ($(strip $(O_NOBATCH)),1)
 	CPPFLAGS += -DNOBATCH
 endif
 
-ifeq ($(O_NOFIFO),1)
+ifeq ($(strip $(O_NOFIFO)),1)
 	CPPFLAGS += -DNOFIFO
 endif
 
-ifeq ($(O_CTX8),1)
+ifeq ($(strip $(O_CTX8)),1)
 	CPPFLAGS += -DCTX8
 endif
 
-ifeq ($(O_ICONS),1)
+ifeq ($(strip $(O_ICONS)),1)
 	CPPFLAGS += -DICONS
 endif
 
-ifeq ($(O_NERD),1)
+ifeq ($(strip $(O_NERD)),1)
 	CPPFLAGS += -DNERD
 endif
 
-ifeq ($(O_QSORT),1)
+ifeq ($(strip $(O_QSORT)),1)
 	CPPFLAGS += -DTOURBIN_QSORT
 endif
 
-ifeq ($(O_BENCH),1)
+ifeq ($(strip $(O_BENCH)),1)
 	CPPFLAGS += -DBENCH
 endif
 
-ifeq ($(O_NOSSN),1)
+ifeq ($(strip $(O_NOSSN)),1)
 	CPPFLAGS += -DNOSSN
 endif
 
-ifeq ($(O_NOUG),1)
+ifeq ($(strip $(O_NOUG)),1)
 	CPPFLAGS += -DNOUG
 endif
 
@@ -117,7 +117,7 @@
 LDLIBS += $(LDLIBS_CURSES)
 
 # static compilation needs libgpm development package
-ifeq ($(O_STATIC),1)
+ifeq ($(strip $(O_STATIC)),1)
 	LDFLAGS += -static
 	LDLIBS += -lgpm
 endif
diff --git a/misc/haiku/Makefile b/misc/haiku/Makefile
index 2f6d78a1fcba484b63385dbe049ecfeb265262e1..9beb12ba0da8dc1cbab222a53b0d228dc1f019b3 100644
--- a/misc/haiku/Makefile
+++ b/misc/haiku/Makefile
@@ -36,66 +36,66 @@ 	O_NORL := 1
 	O_NOLOC := 1
 endif
 
-ifeq ($(O_DEBUG),1)
+ifeq ($(strip $(O_DEBUG)),1)
 	CPPFLAGS += -DDBGMODE
 	CFLAGS += -g
 	LDLIBS += -lrt
 endif
 
-ifeq ($(O_NORL),1)
+ifeq ($(strip $(O_NORL)),1)
 	CPPFLAGS += -DNORL
-else ifeq ($(O_STATIC),1)
+else ifeq ($(strip $(O_STATIC)),1)
 	CPPFLAGS += -DNORL
 else
 	LDLIBS += -lreadline
 endif
 
-ifeq ($(O_PCRE),1)
+ifeq ($(strip $(O_PCRE)),1)
 	CPPFLAGS += -DPCRE
 	LDLIBS += -lpcre
 endif
 
-ifeq ($(O_NOLOC),1)
+ifeq ($(strip $(O_NOLOC)),1)
 	CPPFLAGS += -DNOLOCALE
 endif
 
-ifeq ($(O_NOMOUSE),1)
+ifeq ($(strip $(O_NOMOUSE)),1)
 	CPPFLAGS += -DNOMOUSE
 endif
 
-ifeq ($(O_NOBATCH),1)
+ifeq ($(strip $(O_NOBATCH)),1)
 	CPPFLAGS += -DNOBATCH
 endif
 
-ifeq ($(O_NOFIFO),1)
+ifeq ($(strip $(O_NOFIFO)),1)
 	CPPFLAGS += -DNOFIFO
 endif
 
-ifeq ($(O_CTX8),1)
+ifeq ($(strip $(O_CTX8)),1)
 	CPPFLAGS += -DCTX8
 endif
 
-ifeq ($(O_ICONS),1)
+ifeq ($(strip $(O_ICONS)),1)
 	CPPFLAGS += -DICONS
 endif
 
-ifeq ($(O_NERD),1)
+ifeq ($(strip $(O_NERD)),1)
 	CPPFLAGS += -DNERD
 endif
 
-ifeq ($(O_QSORT),1)
+ifeq ($(strip $(O_QSORT)),1)
 	CPPFLAGS += -DTOURBIN_QSORT
 endif
 
-ifeq ($(O_BENCH),1)
+ifeq ($(strip $(O_BENCH)),1)
 	CPPFLAGS += -DBENCH
 endif
 
-ifeq ($(O_NOSSN),1)
+ifeq ($(strip $(O_NOSSN)),1)
 	CPPFLAGS += -DNOSSN
 endif
 
-ifeq ($(O_NOUG),1)
+ifeq ($(strip $(O_NOUG)),1)
 	CPPFLAGS += -DNOUG
 endif
 
@@ -122,7 +122,7 @@
 LDLIBS += $(LDLIBS_CURSES) $(LDLIBS_HAIKU)
 
 # static compilation needs libgpm development package
-ifeq ($(O_STATIC),1)
+ifeq ($(strip $(O_STATIC)),1)
 	LDFLAGS += -static
 	LDLIBS += -lgpm
 endif