[gnumach] 01/01: rules: Add .custom in uname -v.

[Samuel Thibault]

This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch master
in repository gnumach.

commit 4b081c2d1c892d04660aedc608c70f9b8a777052
Author: Svante Signell <address@hidden>
Date:   Wed Apr 20 23:12:06 2016 +0200

    rules: Add .custom in uname -v.
---
 debian/changelog |  4 ++++
 debian/rules     | 15 +++++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0842120..4e134b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 gnumach (2:1.6+git20160311-2) UNRELEASED; urgency=medium
 
+  [ Samuel Thibault ]
   * control.in: Really bump dpkg-dev and debhelper versions.
   * patches/20_FP_NO.patch: Avoid defining FP_NO.
   * patches/70_dde.patch: Fix crash when delivering the interrupt makes the
@@ -8,6 +9,9 @@ gnumach (2:1.6+git20160311-2) UNRELEASED; urgency=medium
   * patches/99_revert-page-cache-policy.patch: Revert the new cache policy for
     now: when ext2fs has a lot of objects, vm_map_enter becomes very slow.
 
+  [ Svante Signell ]
+  * rules: Add ".custom" in uname -v.
+
  -- Samuel Thibault <address@hidden>  Fri, 11 Mar 2016 23:21:56 +0000
 
 gnumach (2:1.6+git20160311-1) unstable; urgency=medium
diff --git a/debian/rules b/debian/rules
index 179f1f0..8138a98 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,12 +9,15 @@ NOEPOCH_VERSION  := $(shell echo $(FULL_VERSION) | sed -e 
's/.*://g')
 TAR_VERSION      := $(shell echo $(NOEPOCH_VERSION) | sed -e 's/-.*//g')
 UPSTREAM_VERSION := $(shell echo $(TAR_VERSION) | sed -e 's/\.dfsg.*//g')
 NOGIT_VERSION    := $(shell echo $(UPSTREAM_VERSION) | sed -e 
's/+git[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]//g')
-VERSION          := $(NOGIT_VERSION)
 MAJOR            := $(shell echo $(VERSION) | sed -e 's/\..*//g')
 DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
-ifneq (,$(filter custom,$(DEB_BUILD_OPTIONS)))
+ifeq (,$(filter custom,$(DEB_BUILD_OPTIONS)))
+VERSION := $(NOGIT_VERSION)
+CUSTOM :=
+else
 VERSION := $(NOEPOCH_VERSION)
+CUSTOM := .custom
 endif
 
 MACHINE         := 486
@@ -81,7 +84,7 @@ build/config.status: configure
        dh_testdir
        
        -mkdir build
-       cd build && PACKAGE_VERSION_SUFFIX=-486 ../configure $(drivers) \
+       cd build && PACKAGE_VERSION_SUFFIX=$(CUSTOM)-486 ../configure 
$(drivers) \
                CFLAGS="$(CFLAGS)" \
                $(common_configure)
 
@@ -89,7 +92,7 @@ build-xen/config.status: configure
        dh_testdir
        
        -mkdir build-xen
-       cd build-xen && PACKAGE_VERSION_SUFFIX=-xen-486 ../configure \
+       cd build-xen && PACKAGE_VERSION_SUFFIX=$(CUSTOM)-xen-486 ../configure \
                CFLAGS="$(CFLAGS)" \
                $(common_configure) \
                --enable-platform=xen
@@ -98,14 +101,14 @@ build-dbg/config.status: configure
        dh_testdir
        
        -mkdir build-dbg
-       cd build-dbg && PACKAGE_VERSION_SUFFIX=-486-dbg ../configure 
--enable-kdb $(drivers) \
+       cd build-dbg && PACKAGE_VERSION_SUFFIX=$(CUSTOM)-486-dbg ../configure 
--enable-kdb $(drivers) \
                $(common_configure) \
 
 build-xen-dbg/config.status: configure
        dh_testdir
        
        -mkdir build-xen-dbg
-       cd build-xen-dbg && PACKAGE_VERSION_SUFFIX=-xen-486-dbg ../configure 
--enable-kdb \
+       cd build-xen-dbg && PACKAGE_VERSION_SUFFIX=$(CUSTOM)-xen-486-dbg 
../configure --enable-kdb \
                $(common_configure) \
                --enable-platform=xen
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-hurd/gnumach.git