[Pkg-fglrx-devel] r1364 - fglrx-driver/trunk/debian

[Andreas Beckmann]

Author: anbe
Date: 2014-04-23 15:05:22 +0000 (Wed, 23 Apr 2014)
New Revision: 1364

Modified:
   fglrx-driver/trunk/debian/rules
Log:
add support for RC versions

Modified: fglrx-driver/trunk/debian/rules
===================================================================
--- fglrx-driver/trunk/debian/rules	2014-04-23 14:39:44 UTC (rev 1363)
+++ fglrx-driver/trunk/debian/rules	2014-04-23 15:05:22 UTC (rev 1364)
@@ -202,8 +202,8 @@
 INSTALLER_SUFFIX	?= linux-x86.x86_64
 INSTALLER_SUFFIX.zip	?= $(INSTALLER_SUFFIX)
 INSTALLER_SUFFIX.run	?= $(INSTALLER_SUFFIX)
-INSTALLER_ZIP		?= $(INSTALLER_PREFIX.zip)-$(UPSTREAM_VERSION.zip)-$(INSTALLER_SUFFIX.zip).zip
-INSTALLER		?= $(INSTALLER_PREFIX.run)-$(UPSTREAM_VERSION.run)-$(INSTALLER_SUFFIX.run).run
+INSTALLER_ZIP		?= $(INSTALLER_PREFIX.zip)-$(UPSTREAM_VERSION.zip)$(if $(INSTALLER_SUFFIX.zip),-)$(INSTALLER_SUFFIX.zip).zip
+INSTALLER		?= $(INSTALLER_PREFIX.run)-$(UPSTREAM_VERSION.run)$(if $(INSTALLER_SUFFIX.run),-)$(INSTALLER_SUFFIX.run).run
 URL_PATH		?= www2.ati.com/drivers/$(if $(findstring beta,$(NEW_UPSTREAM_VERSION)),beta,linux)
 CACHEDIR		?= /tmp
 NEW_UPSTREAM_VERSION	?= $(patsubst VER=%,%,$(filter VER=%,$(DEB_BUILD_OPTIONS)))
@@ -211,7 +211,8 @@
 UPSTREAM_VERSION.run	?= $(or $(patsubst RVER=%,%,$(filter RVER=%,$(DEB_BUILD_OPTIONS))),$(NEW_UPSTREAM_VERSION))
 INTERNAL_VERSION	:= $(shell test ! -s $(INSTALLER) || sh $(INSTALLER) --info | sed -n '/^Identification:/ s/[^0-9]*//p')
 FIXUP_BETA		?= $(subst -beta,~beta,$(subst beta-,beta,$(subst betav,beta,$1)))
-REAL_UPSTREAM_VERSION	?= $(subst -,.,$(call FIXUP_BETA,$(NEW_UPSTREAM_VERSION)))
+FIXUP_RC		?= $(subst -rc,~rc,$(subst rcv,rc,$(subst rc-,rc,$1)))
+REAL_UPSTREAM_VERSION	?= $(subst -,.,$(call FIXUP_RC,$(call FIXUP_BETA,$(NEW_UPSTREAM_VERSION))))
 
 get-orig-source-checks:
 	test -z "$(NEW_UPSTREAM_VERSION)" && echo "Version not defined" && exit 1 || true