summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@novell.com>2011-06-06 08:57:32 +0300
committerTor Lillqvist <tlillqvist@novell.com>2011-06-06 08:57:32 +0300
commit47ef127cb4f217c00bd7b382008be6e7444af93e (patch)
tree74626f58a10ac077e26aa0fe6c56d573703702d7
parent5cf5db763f05928d88fea377e43f8488c990129f (diff)
Always compare CROSS_COMPILING explicitly to "YES"
-rw-r--r--cppunit/makefile.mk2
-rw-r--r--external/gcc3_specific/makefile.mk2
-rw-r--r--external/mingwheaders/makefile.mk2
-rw-r--r--hyphen/makefile.mk4
-rw-r--r--libtextcat/makefile.mk4
-rw-r--r--redland/raptor/makefile.mk4
-rw-r--r--redland/rasqal/makefile.mk2
-rw-r--r--redland/redland/makefile.mk2
8 files changed, 11 insertions, 11 deletions
diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
index 265bcdcadfd4..4315adf8c9f7 100644
--- a/cppunit/makefile.mk
+++ b/cppunit/makefile.mk
@@ -40,7 +40,7 @@ PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch aix
# warnings.patch: see <https://sourceforge.net/tracker/?func=detail&
# aid=2912630&group_id=11795&atid=311795>
-.IF "$(CROSS_COMPILING)"==""
+.IF "$(CROSS_COMPILING)"!="YES"
.IF "$(OS)" == "WNT"
.IF "$(COM)" == "MSC"
diff --git a/external/gcc3_specific/makefile.mk b/external/gcc3_specific/makefile.mk
index 741288c37e13..53765c9eb55b 100644
--- a/external/gcc3_specific/makefile.mk
+++ b/external/gcc3_specific/makefile.mk
@@ -11,7 +11,7 @@ TARGET=gcc3_specific
.IF "$(GUI)" == "WNT"
-.IF "$(CROSS_COMPILING)" == ""
+.IF "$(CROSS_COMPILING)" != "YES"
# Don't do any of this weird and presumably obsolete crack when
# cross-compiling
diff --git a/external/mingwheaders/makefile.mk b/external/mingwheaders/makefile.mk
index 83d9011dbac8..1928a2c2ca94 100644
--- a/external/mingwheaders/makefile.mk
+++ b/external/mingwheaders/makefile.mk
@@ -33,7 +33,7 @@ TARGET=mingwheaders
.IF "$(OS)$(COM)" == "WNTGCC"
-.IF "$(CROSS_COMPILING)" == ""
+.IF "$(CROSS_COMPILING)" != "YES"
# Don't do any of this weird and presumably obsolete crack when
# cross-compiling
diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk
index d7169e4ee343..80f5bbd74cac 100644
--- a/hyphen/makefile.mk
+++ b/hyphen/makefile.mk
@@ -99,8 +99,8 @@ BUILD_ACTION=dmake
OUT2INC += hyphen.h
.ENDIF # "$(GUI)"=="WNT"
-.IF "$(CROSS_COMPILING)"!=""
-CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)"
+.IF "$(CROSS_COMPILING)"=="YES"
+CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
.ENDIF
# --- Targets ------------------------------------------------------
diff --git a/libtextcat/makefile.mk b/libtextcat/makefile.mk
index 74b180490b46..d47c130dc617 100644
--- a/libtextcat/makefile.mk
+++ b/libtextcat/makefile.mk
@@ -67,8 +67,8 @@ CONFIGURE_FLAGS+= CFLAGS=-D_LINUX_SOURCE_COMPAT
.IF "$(OS)"=="IOS"
CONFIGURE_FLAGS+= --disable-shared
.ENDIF
-.IF "$(CROSS_COMPILING)"!=""
-CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)"
+.IF "$(CROSS_COMPILING)"=="YES"
+CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
.ENDIF
BUILD_ACTION=make
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index 248a72154cef..3b6f696cee45 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -59,7 +59,7 @@ OOO_PATCH_FILES= \
$(TARFILE_NAME).patch.win32 \
raptor-aix.patch
-.IF "$(CROSS_COMPILING)"!=""
+.IF "$(CROSS_COMPILING)"=="YES"
OOO_PATCH_FILES += \
$(TARFILE_NAME).patch.cross
.ENDIF
@@ -145,7 +145,7 @@ CONFIGURE_FLAGS=--disable-static
.ENDIF
# do not enable grddl parser (#i93768#)
CONFIGURE_FLAGS+= --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml
-.IF "$(CROSS_COMPILING)"!=""
+.IF "$(CROSS_COMPILING)"=="YES"
CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
.ENDIF
BUILD_ACTION=$(GNUMAKE)
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
index 417df115d6b0..dbad2d2b4c3c 100644
--- a/redland/rasqal/makefile.mk
+++ b/redland/rasqal/makefile.mk
@@ -130,7 +130,7 @@ CONFIGURE_FLAGS=--disable-shared
CONFIGURE_FLAGS=--disable-static
.ENDIF
CONFIGURE_FLAGS+= --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml
-.IF "$(CROSS_COMPILING)"!=""
+.IF "$(CROSS_COMPILING)"=="YES"
CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
.ENDIF
BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
index ec4941c215f4..b38c45a6e7d1 100644
--- a/redland/redland/makefile.mk
+++ b/redland/redland/makefile.mk
@@ -134,7 +134,7 @@ CONFIGURE_FLAGS=--disable-shared
CONFIGURE_FLAGS=--disable-static
.ENDIF
CONFIGURE_FLAGS+= --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml
-.IF "$(CROSS_COMPILING)"!=""
+.IF "$(CROSS_COMPILING)"=="YES"
CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
.ENDIF
BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)