diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2011-12-12 20:38:39 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-12-12 22:15:00 +0200 |
| commit | f43020eff6c9f1b262f4fc37a94bf17a46e5782f (patch) | |
| tree | 32ad92cedbff6070b425af8c8d0e78a28f7e0c78 /filter/Configuration_filter.mk | |
| parent | 77680bbbadb2e4636164832b58da86f24effe034 (diff) | |
Use OUTDIR_FOR_BUILD for cross-compiling goodness
Diffstat (limited to 'filter/Configuration_filter.mk')
| -rw-r--r-- | filter/Configuration_filter.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk index c09c663bbb75..8a4eba97da27 100644 --- a/filter/Configuration_filter.mk +++ b/filter/Configuration_filter.mk @@ -26,7 +26,7 @@ ifeq ($(SOLAR_JAVA),) filter_MERGE_TARGET := $(SRCDIR)/filter/source/config/tools/merge/pyAltFCFGMerge filter_MERGE := $(gb_PYTHON) $(filter_MERGE_TARGET) else # SOLAR_JAVA -filter_MERGE_TARGET := $(OUTDIR)/bin/FCFGMerge.jar +filter_MERGE_TARGET := $(OUTDIR_FOR_BUILD)/bin/FCFGMerge.jar filter_MERGE := $(JAVAINTERPRETER) $(JAVAIFLAGS) -jar $(filter_MERGE_TARGET) endif |