diff options
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | nix.spec.in (renamed from nix.spec) | 4 | ||||
| -rw-r--r-- | substitute.mk | 3 |
4 files changed, 12 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index 99ec7f741209..2b44a56a6064 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,10 @@ SUBDIRS = externals src scripts corepkgs doc -EXTRA_DIST = substitute.mk nix.spec +EXTRA_DIST = substitute.mk nix.spec nix.spec.in -rpm: dist +include ./substitute.mk + +nix.spec: nix.spec.in + +rpm: nix.spec dist rpm $(EXTRA_RPM_FLAGS) -ta $(distdir).tar.gz diff --git a/configure.ac b/configure.ac index 85244ebabfaf..ecd97b1e779d 100644 --- a/configure.ac +++ b/configure.ac @@ -5,9 +5,9 @@ AM_INIT_AUTOMAKE # Put the revision number in the version. if REVISION=`test -d $srcdir/.svn && svnversion $srcdir 2> /dev/null`; then - VERSION="$VERSION-r$REVISION" + VERSION="${VERSION}-pre${REVISION}" elif REVISION=`cat $srcdir/svn-revision 2> /dev/null`; then - VERSION="$VERSION-r$REVISION" + VERSION="${VERSION}-pre${REVISION}" fi AC_PREFIX_DEFAULT(/nix) diff --git a/nix.spec b/nix.spec.in index 74fc18ef28ca..388c4075196c 100644 --- a/nix.spec +++ b/nix.spec.in @@ -1,11 +1,11 @@ Summary: The Nix software deployment system Name: nix -Version: 0.5 +Version: @version@ Release: 1 License: GPL Group: WeetNiet URL: http://www.cs.uu.nl/groups/ST/twiki/bin/view/Trace/NixDeploymentSystem -Source0: %{name}-%{version}.tar.gz +Source0: %{name}-@version@.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot %define _prefix /nix Prefix: %{_prefix} diff --git a/substitute.mk b/substitute.mk index cc21eba40245..bbdb9b617b4f 100644 --- a/substitute.mk +++ b/substitute.mk @@ -8,5 +8,6 @@ -e "s^@libexecdir\@^$(libexecdir)^g" \ -e "s^@system\@^$(system)^g" \ -e "s^@wget\@^$(wget)^g" \ + -e "s^@version\@^$(VERSION)^g" \ < $< > $@ || rm $@ - chmod +x $@ + if test -x $<; then chmod +x $@; fi |