diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-06-17 16:37:01 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-09-09 22:09:00 +0200 |
| commit | 2e47462d076364725875e770a91a7bb6bbbec2c1 (patch) | |
| tree | 1b170d3a8211b483ab277d790d915e405e18412a /jvmfwk/Module_jvmfwk.mk | |
| parent | dca003a486acb63ea7ba6aaba94f6c9d3715b004 (diff) | |
jvmfwk: install also into instdir
Change-Id: I4004361a85af4e6aed9dd0951d1154a2d99f97e7
Diffstat (limited to 'jvmfwk/Module_jvmfwk.mk')
| -rw-r--r-- | jvmfwk/Module_jvmfwk.mk | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/jvmfwk/Module_jvmfwk.mk b/jvmfwk/Module_jvmfwk.mk index 511448701794..00fd9c569008 100644 --- a/jvmfwk/Module_jvmfwk.mk +++ b/jvmfwk/Module_jvmfwk.mk @@ -12,31 +12,21 @@ $(eval $(call gb_Module_Module,jvmfwk)) ifeq ($(ENABLE_JAVA),TRUE) $(eval $(call gb_Module_add_targets,jvmfwk,\ - Library_jvmfwk \ - Package_rcfiles \ -)) - -$(eval $(call gb_Module_add_targets,jvmfwk,\ - CustomTarget_jreproperties \ - Library_sunjavaplugin \ - Package_jreproperties \ + CustomTarget_jreproperties \ + Library_jvmfwk \ + Library_sunjavaplugin \ + Package_jreproperties \ + Package_rcfiles \ )) ifneq (,$(filter-out MACOSX WNT,$(OS))) ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,jvmfwk,\ - Executable_javaldx \ + Executable_javaldx \ )) endif endif -ifneq ($(gb_RUNNABLE_INSTDIR),) -$(eval $(call gb_Module_add_targets,jvmfwk,\ - Package_jreproperties_install \ - Package_rcfiles_install \ -)) -endif - endif # vim:set noet sw=4 ts=4: |