fix version info for packages that either lack PKG_VERSION or PKG_RELEASE

SVN-Revision: 3890
18 years ago · 450d0b77e6
parent 6860977c4c
commit 450d0b77e6
1 changed files with 9 additions and 1 deletions
--- a/openwrt/package/rules.mk
+++ b/openwrt/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:=