Commit 838d26ef authored by Klaus Aehlig's avatar Klaus Aehlig

Make version granularity a configure option

From 2.10 onwards, all files are installed into versioned
directories. As everything stays compatible between revisions,
it is not technically necessary, to have revisions included in
the directories. Nevertheless, there are situations where this
is desirable. So make it available at configure time, disabled
by default.
Signed-off-by: default avatarKlaus Aehlig <aehlig@google.com>
Reviewed-by: default avatarMichele Tartara <mtartara@google.com>
parent 780060cb
......@@ -55,8 +55,13 @@ SHELL_ENV_INIT = autotools/shell-env-init
# so, if some currently architecture-independent executable is replaced by an
# architecture-dependent one (and hence has to go under $(versiondir)), add a link
# under $(versionedsharedir) but do not change the external links.
versiondir = $(libdir)/ganeti/$(VERSION)
versionedsharedir = $(prefix)/share/ganeti/$(VERSION)
if USE_VERSION_FULL
DIRVERSION=VERSION_FULL
else
DIRVERSION=$(VERSION_MAJOR).$(VERSION_MINOR)
endif
versiondir = $(libdir)/ganeti/$(DIRVERSION)
versionedsharedir = $(prefix)/share/ganeti/$(DIRVERSION)
# Note: these are automake-specific variables, and must be named after
# the directory + 'dir' suffix
......
......@@ -20,6 +20,22 @@ AC_SUBST([VERSION_REVISION], gnt_version_revision)
AC_SUBST([VERSION_SUFFIX], gnt_version_suffix)
AC_SUBST([VERSION_FULL], gnt_version_full)
# --enable-versionfull
AC_ARG_ENABLE([versionfull],
[AS_HELP_STRING([--enable-versionfull],
m4_normalize([use the full version string rather
than major.minor for version directories]))],
[[if test "$enableval" != yes; then
USE_VERSION_FULL=yes
else
USER_VERSION_FULL=no
fi
]],
[USE_VERSION_FULL=no
])
AC_SUBST(USE_VERSION_FULL, $USE_VERSION_FULL)
AM_CONDITIONAL([USE_VERSION_FULL], [test "$USE_VERSION_FULL" = yes])
# --enable-symlinks
AC_ARG_ENABLE([symlinks],
[AS_HELP_STRING([--enable-symlinks],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment