diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-03-26 17:43:53 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-03-26 17:47:19 +0200 |
| commit | 094cf7caf9659be5a0325048fa8a164e22de1fc9 (patch) | |
| tree | c4bfeafbe139e66df6d9de75b816d29f29de06e2 /jvmfwk/Package_rcfiles.mk | |
| parent | cedaaf89d7d9c2e41650dcc4df07b2be24649826 (diff) | |
Fix delivery of jvmfwk ini/data files
...that are (also) used during the build (e.g., cd testtools/*/lib &&
./bridgetest_inprocess_java). Broken by gbuild'ification of jvmfwk.
Diffstat (limited to 'jvmfwk/Package_rcfiles.mk')
| -rw-r--r-- | jvmfwk/Package_rcfiles.mk | 32 |
1 files changed, 30 insertions, 2 deletions
diff --git a/jvmfwk/Package_rcfiles.mk b/jvmfwk/Package_rcfiles.mk index 68dad6fe5e5d..b86a88c3af3f 100644 --- a/jvmfwk/Package_rcfiles.mk +++ b/jvmfwk/Package_rcfiles.mk @@ -27,8 +27,36 @@ $(eval $(call gb_Package_Package,jvmfwk_rcfiles,$(SRCDIR)/jvmfwk)) -$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(call gb_Helper_get_rcfile,bin/sunjavaplugin),plugins/sunmajor/pluginlib/sunjavapluginrc)) -$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(call gb_Helper_get_rcfile,bin/jvmfwk3),source/jvmfwk3rc)) $(eval $(call gb_Package_add_file,jvmfwk_rcfiles,bin/javasettingsunopkginstall.xml,source/javasettingsunopkginstall.xml)) +# The below files (intended to be also used during the build) need to go into +# the same directory as dynamic libraries (either bin or lib): + +ifeq ($(GUI),WNT) +my_Package_jvmfwk_rcfiles_dir = bin +else +my_Package_jvmfwk_rcfiles_dir = lib +endif + +$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(call gb_Helper_get_rcfile,$(my_Package_jvmfwk_rcfiles_dir)/sunjavaplugin),plugins/sunmajor/pluginlib/sunjavapluginrc)) +$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(call gb_Helper_get_rcfile,$(my_Package_jvmfwk_rcfiles_dir)/jvmfwk3),source/jvmfwk3rc)) + +ifeq ($(GUI),UNX) +ifeq ($(OS),FREEBSD) +$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(my_Package_jvmfwk_rcfiles_dir)/javavendors.xml,distributions/OpenOfficeorg/javavendors_freebsd.xml)) +else ifeq ($(OS),MACOSX) +$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(my_Package_jvmfwk_rcfiles_dir)/javavendors.xml,distributions/OpenOfficeorg/javavendors_macosx.xml)) +else ifeq ($(OS),LINUX) +$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(my_Package_jvmfwk_rcfiles_dir)/javavendors.xml,distributions/OpenOfficeorg/javavendors_linux.xml)) +else ifeq ($(OS),AIX) +$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(my_Package_jvmfwk_rcfiles_dir)/javavendors.xml,distributions/OpenOfficeorg/javavendors_linux.xml)) +else +$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(my_Package_jvmfwk_rcfiles_dir)/javavendors.xml,distributions/OpenOfficeorg/javavendors_unx.xml)) +endif +else ifeq ($(GUI),WNT) +$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(my_Package_jvmfwk_rcfiles_dir)/javavendors.xml,distributions/OpenOfficeorg/javavendors_wnt.xml)) +else +$(call gb_Output_error,Unsupported platform) +endif + # vim:set shiftwidth=4 softtabstop=4 expandtab: |