diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rwxr-xr-x | autogen.sh | 3 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rwxr-xr-x | gen-version | 4 |
5 files changed, 10 insertions, 6 deletions
@@ -121,6 +121,7 @@ po/.intltool-merge-cache \#* *~ abrt.spec +abrt-version # autogenerated soure file src/gui-wizard-gtk/wizard_glade.c diff --git a/Makefile.am b/Makefile.am index c8671dd5..484ed99a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,7 +5,7 @@ DISTCHECK_CONFIGURE_FLAGS = \ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) EXTRA_DIST = doc/coding-style abrt.spec.in abrt.pc.in doc/abrt-plugin/ doc/howto-write-reporter \ - gen-version asciidoc.conf + abrt-version asciidoc.conf pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = abrt.pc @@ -17,14 +17,14 @@ RPM_DIRS = --define "_sourcedir `pwd`" \ --define "_srcrpmdir `pwd`" rpm: - autoconf --force ./gen-version + autoconf --force $(MAKE) dist rpmbuild $(RPM_DIRS) -ba abrt.spec srpm: - autoconf --force ./gen-version + autoconf --force $(MAKE) dist rpmbuild $(RPM_DIRS) -bs abrt.spec @@ -23,3 +23,6 @@ autoconf --force || exit 1 echo "Running automake..." automake --add-missing --force --copy || exit 1 + +echo "Running gen-version" +./gen-version
\ No newline at end of file diff --git a/configure.ac b/configure.ac index 9dbf47f1..740ccc90 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_INIT([abrt], - m4_esyscmd([./gen-version]), + m4_esyscmd([cat ./abrt-version]), [crash-catcher@fedorahosted.org]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/gen-version b/gen-version index b0af4fdb..8925aef9 100755 --- a/gen-version +++ b/gen-version @@ -1,6 +1,6 @@ #!/bin/bash -DEF_VER=2.0.1 +DEF_VER=2.0.2 if test -d .git -o -f .git then @@ -14,4 +14,4 @@ fi sed -e "s/@@ABRT_VERSION@@/$VN/g" < abrt.spec.in > abrt.spec -echo -n $VN +echo -n $VN > abrt-version |