diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-03-31 14:02:31 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-03-31 14:02:31 +0100 |
| commit | 9795254fd7238b63ac8830a31ba5f9687d452129 (patch) | |
| tree | be1608fac67fb1077ff95c137b2336c7f5cb2b1c /jfreereport/java/libserializer | |
| parent | efae191b6c24375826c8809a5e30383687024090 (diff) | |
fix merge error
Diffstat (limited to 'jfreereport/java/libserializer')
| -rw-r--r-- | jfreereport/java/libserializer/makefile.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/jfreereport/java/libserializer/makefile.mk b/jfreereport/java/libserializer/makefile.mk index cabca08cba5f..d5ee7cc878c6 100644 --- a/jfreereport/java/libserializer/makefile.mk +++ b/jfreereport/java/libserializer/makefile.mk @@ -50,7 +50,7 @@ JAVA_HOME= .EXPORT : JAVA_HOME BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBSERIALIZER_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="$(LIBSERIALIZER_VERSION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar .ENDIF .ENDIF # $(SOLAR_JAVA)!= "" |