[Libreoffice-commits] .: RepositoryFixes.mk solenv/gbuild

[François Tigeot]

 RepositoryFixes.mk      |    4 +++-
 solenv/gbuild/gbuild.mk |    4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 573dc169fd3f91662d42f5ceb6dacf09f3096f59
Author: Francois Tigeot <ftigeot at wolfpond.org>
Date:   Mon Mar 21 23:21:20 2011 +0100

    Treat DragonFly as Linux.
    
    The new build system has introduced some new operating system
    conditionals. Use the same path as Linux on DragonFly for now.

diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 546643c..8eeec62 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -28,7 +28,9 @@
 # fixes for all the libraries that are named with too much creativity and do
 # not follow any of the established nameschemes
 
-ifeq ($(OS),LINUX)
+# Make has no support for 'or' clauses in conditionals,
+# we use a filter expression instead.
+ifneq (,$(filter LINUX DRAGONFLY, $(OS)))
 gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 358dfec..41169fd 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -143,7 +143,9 @@ $(eval $(call gb_Helper_init_registries))
 $(eval $(call gb_Helper_add_repositories,$(gb_REPOS)))
 $(eval $(call gb_Helper_collect_libtargets))
 
-ifeq ($(OS),LINUX)
+# Make has no support for 'or' clauses in conditionals,
+# we use a filter expression instead.
+ifneq (,$(filter LINUX DRAGONFLY, $(OS)))
 include $(GBUILDDIR)/platform/linux.mk
 else
 ifeq ($(OS),WNT)