From 176782e3030d17a05dc7addf4f23bb465995a1db Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Mon, 28 Oct 2013 18:43:49 +0100 Subject: jvmfwk: rewrite odd conditional Change-Id: I69f8e44b0845ac2d6db5a32298de1b561be61f2c --- jvmfwk/Package_rcfiles.mk | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'jvmfwk') diff --git a/jvmfwk/Package_rcfiles.mk b/jvmfwk/Package_rcfiles.mk index ac7757d3731f..124dcfd80347 100644 --- a/jvmfwk/Package_rcfiles.mk +++ b/jvmfwk/Package_rcfiles.mk @@ -11,8 +11,9 @@ $(eval $(call gb_Package_Package,jvmfwk_javavendors,$(SRCDIR)/jvmfwk)) $(eval $(call gb_Package_set_outdir,jvmfwk_javavendors,$(INSTROOT))) -ifneq ($(OS),WNT) -ifeq ($(OS),FREEBSD) +ifeq ($(OS),WNT) +$(eval $(call gb_Package_add_file,jvmfwk_javavendors,$(LIBO_URE_SHARE_FOLDER)/misc/javavendors.xml,distributions/OpenOfficeorg/javavendors_wnt.xml)) +else ifeq ($(OS),FREEBSD) $(eval $(call gb_Package_add_file,jvmfwk_javavendors,$(LIBO_URE_SHARE_FOLDER)/misc/javavendors.xml,distributions/OpenOfficeorg/javavendors_freebsd.xml)) else ifeq ($(OS),MACOSX) $(eval $(call gb_Package_add_file,jvmfwk_javavendors,$(LIBO_URE_SHARE_FOLDER)/misc/javavendors.xml,distributions/OpenOfficeorg/javavendors_macosx.xml)) @@ -23,8 +24,5 @@ $(eval $(call gb_Package_add_file,jvmfwk_javavendors,$(LIBO_URE_SHARE_FOLDER)/mi else $(eval $(call gb_Package_add_file,jvmfwk_javavendors,$(LIBO_URE_SHARE_FOLDER)/misc/javavendors.xml,distributions/OpenOfficeorg/javavendors_unx.xml)) endif -else -$(eval $(call gb_Package_add_file,jvmfwk_javavendors,$(LIBO_URE_SHARE_FOLDER)/misc/javavendors.xml,distributions/OpenOfficeorg/javavendors_wnt.xml)) -endif # vim:set noet sw=4 ts=4: -- cgit