summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-06-02 00:01:00 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-06-02 00:01:00 +0000
commit7741a5ad37a208843fca3ae163328ae33a895f12 (patch)
treefbb61ba02206bca4101c2d8b4097c22fe39ccf31
parent50a26cd5e29260ae1cc3a8dd0f19abe26d8e94ef (diff)
fix version info for packages that either lack PKG_VERSION or PKG_RELEASE
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3890 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/rules.mk10
1 files changed, 9 insertions, 1 deletions
diff --git a/package/rules.mk b/package/rules.mk
index fe16a18f9..79c2b3460 100644
--- a/package/rules.mk
+++ b/package/rules.mk
@@ -55,7 +55,15 @@ define Package/Default
DEPENDS:=
MAINTAINER:=OpenWrt Developers Team <openwrt-devel@openwrt.org>
SOURCE:=$(patsubst $(TOPDIR)/%,%,${shell pwd})
- VERSION:=$(PKG_VERSION)-$(PKG_RELEASE)
+ ifneq ($(PKG_VERSION),)
+ ifneq ($(PKG_RELEASE),)
+ VERSION:=$(PKG_VERSION)-$(PKG_RELEASE)
+ else
+ VERSION:=$(PKG_VERSION)
+ endif
+ else
+ VERSION:=$(PKG_RELEASE)
+ endif
PKGARCH:=$(ARCH)
PRIORITY:=optional
DEFAULT:=