From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 26 May 2011 15:37:52 +0000 (+0200)
Subject: build-essentials: Remove leading epoch when epoch equals zero.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91bfc58e63df754542ceb0e650df9ed2403f2d06;p=ipfire-3.x.git

build-essentials: Remove leading epoch when epoch equals zero.
---

diff --git a/pkgs/build-essentials/build-essentials.nm b/pkgs/build-essentials/build-essentials.nm
index e226c9e21..67b5e89ae 100644
--- a/pkgs/build-essentials/build-essentials.nm
+++ b/pkgs/build-essentials/build-essentials.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
 
 PKG_NAME       = build-essentials
 PKG_VER        = $(DISTRO_VERSION)
-PKG_REL        = 16
+PKG_REL        = 17
 PKG_EPOCH      = 1
 PKG_ARCH       = noarch
 
diff --git a/pkgs/build-essentials/buildsystem/Constants b/pkgs/build-essentials/buildsystem/Constants
index a649885ed..e506d6a2d 100644
--- a/pkgs/build-essentials/buildsystem/Constants
+++ b/pkgs/build-essentials/buildsystem/Constants
@@ -106,9 +106,12 @@ PKG_EPOCH      = 0
 PKG_RELEASE    = $(PKG_REL).$(DISTRO_DISTTAG)
 PKG_ARCH       = $(DISTRO_ARCH)
 
+# Helper variable that says if EPOCH was set to another value than 0.
+HAVE_EPOCH     = $(filter-out $(EPOCH),0)
+
 # Shortcut to package name + version
 THISAPP        = $(PKG_NAME)-$(PKG_VER)
-THISVER        = $(PKG_EPOCH):$(PKG_VER)-$(PKG_RELEASE)
+THISVER        = $(if $(HAVE_EPOCH),$(PKG_EPOCH):)$(PKG_VER)-$(PKG_RELEASE)
 
 #  All packages depend on gcc and headers by default.
 PKG_BUILD_DEPS+= gcc glibc-devel kernel-headers