From d1eadcbccee737889cf78744957b1432f0cd88d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Luttringer?= Date: Tue, 18 Jun 2013 12:27:14 +0200 Subject: [PATCH] Use autoconf version as installsystems version --- Makefile.am | 26 ++++++++++++++++--- configure.ac | 2 ++ .../{__init__.py => __init__.py.in} | 2 +- 3 files changed, 25 insertions(+), 5 deletions(-) rename installsystems/{__init__.py => __init__.py.in} (97%) diff --git a/Makefile.am b/Makefile.am index 1238420..c2b3812 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,13 +25,31 @@ EXTRA_DIST = COPYRIGHT LICENSE \ dist_doc_DATA = README COPYRIGHT LICENSE AUTHORS DEPENDENCIES # main binary -dist_bin_SCRIPTS = bin/is +dist_bin_SCRIPTS = bin/is installsystems/__init__.py # python library installsystemsdir=$(pythondir)/installsystems -installsystems_PYTHON = installsystems/*.py - -CLEANFILES = $(bin_SCRIPTS) +installsystems_PYTHON = \ + installsystems/__init__.py \ + installsystems/config.py \ + installsystems/database.py \ + installsystems/exception.py \ + installsystems/image.py \ + installsystems/printer.py \ + installsystems/repository.py \ + installsystems/tarball.py \ + installsystems/template.py \ + installsystems/tools.py + +do_substitution = $(SED) -e 's,[@]pythondir[@],$(pythondir),g' \ + -e 's,[@]PACKAGE[@],$(PACKAGE),g' \ + -e 's,[@]VERSION[@],$(VERSION),g' + +installsystems/__init__.py: installsystems/__init__.py.in + $(do_substitution) < $(srcdir)/$< > $@ + + +CLEANFILES = $(bin_SCRIPTS) installsystems/__init__.py install-exec-hook: ln -fs is $(DESTDIR)$(bindir)/installsystems diff --git a/configure.ac b/configure.ac index b0c9200..014495c 100644 --- a/configure.ac +++ b/configure.ac @@ -35,4 +35,6 @@ AC_ARG_WITH([zshcompdir], ) AC_SUBST([zshcompdir], [$with_zshcompdir]) +AC_PROG_SED + AC_OUTPUT diff --git a/installsystems/__init__.py b/installsystems/__init__.py.in similarity index 97% rename from installsystems/__init__.py rename to installsystems/__init__.py.in index e084336..7c2757c 100644 --- a/installsystems/__init__.py +++ b/installsystems/__init__.py.in @@ -21,7 +21,7 @@ InstallSystems module ''' canonical_name="installsystems" -version = "9" +version = "@VERSION@" verbosity = 1 # 0: quiet, 1: normal, 2: debug __all__ = [] -- GitLab