diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-09-09 14:53:36 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-09-09 22:09:15 +0200 |
| commit | 3cc8feff1b81ddfe4eafa5cf23e98b1c536f5f1a (patch) | |
| tree | 0d579a72d42d162856f81f9ed9e4cdb58eb35cb6 | |
| parent | 64405aa69f3c4e305f11f2d3ddbddd2bbedbb264 (diff) | |
gbuild: fix Jar layers for WNT
Change-Id: I516abd165f947c155f3e969e27f51fb093bfa8fc
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | solenv/gbuild/Jar.mk | 4 |
3 files changed, 4 insertions, 2 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 586e2e073817..14f38fa8d5da 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -315,6 +315,7 @@ export LIBO_SHARE_PRESETS_FOLDER=@LIBO_SHARE_PRESETS_FOLDER@ export LIBO_SHARE_RESOURCE_FOLDER=@LIBO_SHARE_RESOURCE_FOLDER@ export LIBO_URE_LIB_FOLDER=@LIBO_URE_LIB_FOLDER@ export LIBO_URE_SHARE_FOLDER=@LIBO_URE_SHARE_FOLDER@ +export LIBO_URE_SHARE_JAVA_FOLDER=@LIBO_URE_SHARE_JAVA_FOLDER@ export LIBO_VERSION_MAJOR=@LIBO_VERSION_MAJOR@ export LIBO_VERSION_MICRO=@LIBO_VERSION_MICRO@ export LIBO_VERSION_MINOR=@LIBO_VERSION_MINOR@ diff --git a/configure.ac b/configure.ac index 57ce73fb4499..32195843aa2a 100644 --- a/configure.ac +++ b/configure.ac @@ -2969,6 +2969,7 @@ AC_SUBST(LIBO_SHARE_PRESETS_FOLDER) AC_SUBST(LIBO_SHARE_RESOURCE_FOLDER) AC_SUBST(LIBO_URE_LIB_FOLDER) AC_SUBST(LIBO_URE_SHARE_FOLDER) +AC_SUBST(LIBO_URE_SHARE_JAVA_FOLDER) AC_SUBST(ENABLE_MACOSX_MACLIKE_APP_STRUCTURE) dnl =================================================================== diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk index 7ef7212e4a6c..dff27062ce7a 100644 --- a/solenv/gbuild/Jar.mk +++ b/solenv/gbuild/Jar.mk @@ -23,8 +23,8 @@ gb_Jar_JAVACOMMAND := $(JAVAINTERPRETER) gb_Jar_JARCOMMAND := jar gb_Jar_LAYER_DIRS := \ - OOO:$(gb_PROGRAMDIRNAME)/classes \ - URE:ure/share/java + OOO:$(LIBO_SHARE_JAVA_FOLDER) \ + URE:$(LIBO_URE_SHARE_JAVA_FOLDER) # location of files going to be packed into .jar file define gb_Jar_get_workdir |