diff options
| author | Andreas Boll <andreas.boll.dev@gmail.com> | 2013-06-04 20:39:13 +0200 |
|---|---|---|
| committer | Andreas Boll <andreas.boll.dev@gmail.com> | 2013-06-06 19:07:14 +0200 |
| commit | c0f7ccc136effd921ef50b54ad0b8d349488f827 (patch) | |
| tree | 7d34ae3e1f59e820f1f4cb4e76d58acc674ea5c9 | |
| parent | 5bd808a2c793a81fe79c0a473c25c6e50c313fef (diff) | |
build: Unify PACKAGE_VERSION on autotools, scons and Android
This patch unifies mesa's PACKAGE_VERSION on autotools, scons and
Android build systems.
Current behaviour is:
- Autotools uses 9.2.0 as PACKAGE_VERSION
- Scons and Android use 9.2-devel as PACKAGE_VERSION
With this patch all three build systems use 9.2.0-devel as
PACKAGE_VERSION.
Reviewed-by: Brian Paul <brianp@vmware.com>
| -rw-r--r-- | Android.common.mk | 2 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | SConstruct | 2 | ||||
| -rw-r--r-- | configure.ac | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/Android.common.mk b/Android.common.mk index 215c640fbc..c6ee4e1dbe 100644 --- a/Android.common.mk +++ b/Android.common.mk @@ -35,7 +35,7 @@ LOCAL_C_INCLUDES += \ # define ANDROID_VERSION (e.g., 4.0.x => 0x0400) LOCAL_CFLAGS += \ - -DPACKAGE_VERSION=\"9.2-devel\" \ + -DPACKAGE_VERSION=\"9.2.0-devel\" \ -DPACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa\" \ -DANDROID_VERSION=0x0$(MESA_ANDROID_MAJOR_VERSION)0$(MESA_ANDROID_MINOR_VERSION) diff --git a/Makefile.am b/Makefile.am index 0ce94557eb..92b792d60c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -36,7 +36,7 @@ check-local: # Rules for making release tarballs -PACKAGE_VERSION=9.2-devel +PACKAGE_VERSION=9.2.0-devel PACKAGE_DIR = Mesa-$(PACKAGE_VERSION) PACKAGE_NAME = MesaLib-$(PACKAGE_VERSION) diff --git a/SConstruct b/SConstruct index 1807ff8353..834e9d58a8 100644 --- a/SConstruct +++ b/SConstruct @@ -70,7 +70,7 @@ if env['gles']: # Environment setup env.Append(CPPDEFINES = [ - ('PACKAGE_VERSION', '\\"9.2-devel\\"'), + ('PACKAGE_VERSION', '\\"9.2.0-devel\\"'), ('PACKAGE_BUGREPORT', '\\"https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa\\"'), ]) diff --git a/configure.ac b/configure.ac index bccab0aa1f..b0daf251d1 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ dnl Tell the user about autoconf.html in the --help output m4_divert_once([HELP_END], [ See docs/autoconf.html for more details on the options for Mesa.]) -AC_INIT([Mesa], [9.2.0], +AC_INIT([Mesa], [9.2.0-devel], [https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa]) AC_CONFIG_AUX_DIR([bin]) AC_CONFIG_MACRO_DIR([m4]) |