From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 2 Oct 2010 22:48:38 +0000 (+0200)
Subject: naoki: Add functionality to have different version numbers than main package.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f600c4272ffcec91bb5926ab111acf1d824e56d7;p=ipfire-3.x.git

naoki: Add functionality to have different version numbers than main package.
---

diff --git a/pkgs/Constants b/pkgs/Constants
index e88552b3b..5142556a8 100644
--- a/pkgs/Constants
+++ b/pkgs/Constants
@@ -82,13 +82,6 @@ export BUILD_ID
 # Package variables
 #
 ###############################################################################
-#
-# Constants
-#
-
-# The suffix of the package name
-PKG_SUFFIX = -$(PKG_VER)-$(DISTRO_SNAME)$(DISTRO_EPOCH)-$(PKG_ARCH).$(PKG_REL).ipk
-
 #
 # Variables
 #
diff --git a/pkgs/Functions b/pkgs/Functions
index 258a02fa3..ff64af3b9 100644
--- a/pkgs/Functions
+++ b/pkgs/Functions
@@ -7,7 +7,10 @@
 
 include $(PKGROOT)/gmsl
 
-DO_PACKAGE_FILENAME = $(1)$(PKG_SUFFIX)
+DO_PACKAGE_FILENAME = $(1)$(call DO_PKG_SUFFIX,$(1))
+
+DO_PKG_SUFFIX = \
+	-$(if $(PKG_VER-$(1)),$(PKG_VER-$(1)),$(PKG_VER))-$(DISTRO_SNAME)$(DISTRO_EPOCH)-$(PKG_ARCH).$(if $(PKG_REL-$(1)),$(PKG_REL-$(1)),$(PKG_REL)).ipk
 
 define DO_PACKAGE
 	@echo "#####################################################################"