diff options
| author | David Tardon <dtardon@redhat.com> | 2011-05-23 11:32:44 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2011-05-24 09:10:34 +0200 |
| commit | e7ade84f6a66f8a915da70f486f70cb894bb9775 (patch) | |
| tree | 9894fe6143ceb79c713cf9b0213941a555c0739f /scripting/util/provider/beanshell/makefile.mk | |
| parent | 88dfc7bb329711a17392a8fcc92809cbf6f2a999 (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/provider/beanshell/makefile.mk')
| -rwxr-xr-x | scripting/util/provider/beanshell/makefile.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/scripting/util/provider/beanshell/makefile.mk b/scripting/util/provider/beanshell/makefile.mk index 1f70fcbf5b..a7c74f5180 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 |