summaryrefslogtreecommitdiff
path: root/jfreereport/ExternalProject_jfreereport_libloader.mk
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-01-11 15:07:10 +0200
committerTor Lillqvist <tml@iki.fi>2013-01-11 15:07:10 +0200
commitf5cde53719544c7445ab6fdb465e332ac5678b02 (patch)
tree5837c8e919f7079e418a2ebba0d04465951f099e /jfreereport/ExternalProject_jfreereport_libloader.mk
parent3c91ac17ae401a1a2bb5752892fb108872096160 (diff)
Set version number in AC_INIT() in configure.ac only
Output a solenv/inc/minor.mk based on that. Get rid of RSCVERSION and RSCREVISION. Automate the end of the copyright year range, although I am actually not sure if that is OK. Change-Id: Ibae2d139b1dd468ee80d18a2a41b786a532df809
Diffstat (limited to 'jfreereport/ExternalProject_jfreereport_libloader.mk')
-rw-r--r--jfreereport/ExternalProject_jfreereport_libloader.mk4
1 files changed, 1 insertions, 3 deletions
diff --git a/jfreereport/ExternalProject_jfreereport_libloader.mk b/jfreereport/ExternalProject_jfreereport_libloader.mk
index e6fd4e1df501..90a97a7c0cd8 100644
--- a/jfreereport/ExternalProject_jfreereport_libloader.mk
+++ b/jfreereport/ExternalProject_jfreereport_libloader.mk
@@ -7,8 +7,6 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-# for RSCREVISION
-include $(SOLARENV)/inc/minor.mk
# for VERSION
include $(SRCDIR)/jfreereport/version.mk
@@ -25,7 +23,7 @@ $(call gb_ExternalProject_get_state_target,jfreereport_libloader,build) :
$(ICECREAM_RUN) "$(ANT)" \
-q \
-f build.xml \
- -Dbuild.label="build-$(RSCREVISION)" \
+ -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
$(if $(filter yes,$(JAVACISGCJ))\
,-Dbuild.compiler=gcj \
,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \