From 9795254fd7238b63ac8830a31ba5f9687d452129 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 31 Mar 2011 14:02:31 +0100 Subject: fix merge error --- jfreereport/java/flute/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'jfreereport/java/flute/makefile.mk') diff --git a/jfreereport/java/flute/makefile.mk b/jfreereport/java/flute/makefile.mk index c25bd99ebf31..0e4d28b173a2 100644 --- a/jfreereport/java/flute/makefile.mk +++ b/jfreereport/java/flute/makefile.mk @@ -51,7 +51,7 @@ JAVA_HOME= .EXPORT : JAVA_HOME BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(FLUTE_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar .ELSE -BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar +BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(FLUTE_VERSION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar .ENDIF .ENDIF # $(SOLAR_JAVA)!= "" -- cgit