summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-05-15 09:19:51 +0300
committerTor Lillqvist <tml@iki.fi>2013-05-15 09:49:38 +0300
commit32bec67bc644fbb7f5024113b24702547f7f8950 (patch)
treebb3633f380d16b9dc10d6e3587869fc9ab02e76e
parent3e563377333881efa60aaa93d2feeaf647cf19ff (diff)
LIBO_THIS_YEAR is used only as an AC_DEFINEd variable
Change-Id: I0c9676fcffbb1080a7d8dd26c80f9a9af08aa04c
-rw-r--r--config_host.mk.in1
-rw-r--r--configure.ac5
2 files changed, 2 insertions, 4 deletions
diff --git a/config_host.mk.in b/config_host.mk.in
index ada0151bf6e8..dd8400a3b86c 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -291,7 +291,6 @@ export LIBLANGTAG_CFLAGS=$(gb_SPACE)@LIBLANGTAG_CFLAGS@
export LIBLANGTAG_LIBS=$(gb_SPACE)@LIBLANGTAG_LIBS@
export LIBLAYOUT_JAR=@LIBLAYOUT_JAR@
export LIBLOADER_JAR=@LIBLOADER_JAR@
-export LIBO_THIS_YEAR=@LIBO_THIS_YEAR@
export LIBO_VERSION_MAJOR=@LIBO_VERSION_MAJOR@
export LIBO_VERSION_MICRO=@LIBO_VERSION_MICRO@
export LIBO_VERSION_MINOR=@LIBO_VERSION_MINOR@
diff --git a/configure.ac b/configure.ac
index 31e07e48d744..eb7ce82d21a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4204,13 +4204,12 @@ AC_SUBST(LIBO_VERSION_PATCH)
AC_SUBST(LIBO_VERSION_SUFFIX)
AC_SUBST(LIBO_VERSION_SUFFIX_SUFFIX)
-LIBO_THIS_YEAR=`date +%Y`
-AC_SUBST(LIBO_THIS_YEAR)
-
AC_DEFINE_UNQUOTED(LIBO_VERSION_MAJOR,$LIBO_VERSION_MAJOR)
AC_DEFINE_UNQUOTED(LIBO_VERSION_MINOR,$LIBO_VERSION_MINOR)
AC_DEFINE_UNQUOTED(LIBO_VERSION_MICRO,$LIBO_VERSION_MICRO)
AC_DEFINE_UNQUOTED(LIBO_VERSION_PATCH,$LIBO_VERSION_PATCH)
+
+LIBO_THIS_YEAR=`date +%Y`
AC_DEFINE_UNQUOTED(LIBO_THIS_YEAR,$LIBO_THIS_YEAR)
# This UPD silly thing must go away soon