diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-28 18:43:49 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-28 20:17:25 +0100 |
| commit | 176782e3030d17a05dc7addf4f23bb465995a1db (patch) | |
| tree | f7855021477e78e639bcf2090cf66cb6c7e34227 /jvmfwk | |
| parent | 5864529a7c84a99d351bb693a68946582f1568ef (diff) | |
jvmfwk: rewrite odd conditional
Change-Id: I69f8e44b0845ac2d6db5a32298de1b561be61f2c
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/Package_rcfiles.mk | 8 |
1 files changed, 3 insertions, 5 deletions
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: |