diff options
author | Tor Lillqvist <tlillqvist@novell.com> | 2011-06-06 08:57:32 +0300 |
---|---|---|
committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-06-06 08:57:32 +0300 |
commit | 8fe1738cd4cae6a3b3eb467605c9d8e81355930d (patch) | |
tree | 71238ad409b12d88ff104b063ae8705a4525d1c9 | |
parent | dcfd860f5bb25ff6b2d80c1cfb209f70222c5cd0 (diff) |
Always compare CROSS_COMPILING explicitly to "YES"
-rw-r--r-- | cppunit/makefile.mk | 2 | ||||
-rw-r--r-- | external/gcc3_specific/makefile.mk | 2 | ||||
-rw-r--r-- | external/mingwheaders/makefile.mk | 2 | ||||
-rw-r--r-- | hyphen/makefile.mk | 4 | ||||
-rw-r--r-- | libtextcat/makefile.mk | 4 | ||||
-rw-r--r-- | redland/raptor/makefile.mk | 4 | ||||
-rw-r--r-- | redland/rasqal/makefile.mk | 2 | ||||
-rw-r--r-- | redland/redland/makefile.mk | 2 |
8 files changed, 11 insertions, 11 deletions
diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk index 265bcdc..4315adf 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 741288c..53765c9 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 83d9011..1928a2c 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 d7169e4..80f5bbd 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 74b1804..d47c130 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 248a721..3b6f696 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 417df11..dbad2d2 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 ec4941c..b38c45a 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) |