summaryrefslogtreecommitdiff
path: root/scripting/util
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2011-05-23 11:32:44 +0200
committerDavid Tardon <dtardon@redhat.com>2011-05-24 09:16:02 +0200
commite69254a1a6afe60472e8b25454232c400c2cad04 (patch)
treea1504baa1cf15f26946e307abc9618cded206230 /scripting/util
parent7491e5cf8b42113ce08525b869d487cddb2cea35 (diff)
do not include bsh.jar when building with system bsh
Signed-off-by: Tor Lillqvist <tlillqvist@novell.com> Signed-off-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'scripting/util')
-rwxr-xr-xscripting/util/provider/beanshell/makefile.mk6
1 files changed, 6 insertions, 0 deletions
diff --git a/scripting/util/provider/beanshell/makefile.mk b/scripting/util/provider/beanshell/makefile.mk
index 1f70fcbf5bb7..a7c74f51803c 100755
--- a/scripting/util/provider/beanshell/makefile.mk
+++ b/scripting/util/provider/beanshell/makefile.mk
@@ -36,7 +36,9 @@ EXTENSIONNAME:=ScriptProviderForBeanShell
EXTENSION_ZIPNAME:=script-provider-for-beanshell
COMPONENT_JARFILES=$(EXTENSIONDIR)$/$(EXTENSIONNAME).jar
+.IF "$(SYSTEM_BSH)" != "YES"
EXTENSION_PACKDEPS=$(SOLARBINDIR)$/bsh.jar
+.ENDIF
.IF "$(ENABLE_SCRIPTING_BEANSHELL)" != "YES"
@all:
@@ -47,12 +49,16 @@ EXTENSION_PACKDEPS=$(SOLARBINDIR)$/bsh.jar
.INCLUDE : target.mk
.INCLUDE : extension_post.mk
+.IF "$(SYSTEM_BSH)" != "YES"
+
ALLTAR : $(EXTENSIONDIR)$/bsh.jar
$(EXTENSIONDIR)$/bsh.jar : $(SOLARBINDIR)$/bsh.jar
@@-$(MKDIRHIER) $(@:d)
$(COMMAND_ECHO)$(COPY) $< $@
+.ENDIF
+
.ELSE
.INCLUDE : target.mk