Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #14 from basho/gh13-fix-rhel-package-naming

Fix RHEL packaging naming clash, bug #13
  • Loading branch information...
commit fd487cd0c2ce220b25f007450b1a29e81bb05d17 2 parents b9a0ae3 + 69f64ef
Jared Morrow jaredmorrow authored
Showing with 5 additions and 3 deletions.
  1. +1 −1  ebin/innostore.app
  2. +4 −2 package/Makefile
2  ebin/innostore.app
View
@@ -1,6 +1,6 @@
{application, innostore,
[{description, "Simple Erlang API to Embedded Inno DB"},
- {vsn, "1.0.3"},
+ {vsn, "1.0.4"},
{modules, [
innostore,
innostore_riak,
6 package/Makefile
View
@@ -8,8 +8,10 @@ ifeq ($(PKGER),)
# Debian
PKGNAME = $(RELEASE_NAME)-$(RELEASE)-deb-$(PLATFORM).tar.gz
else
-# Redhat
-PKGNAME = $(RELEASE_NAME)-$(RELEASE)-rh-$(PLATFORM).tar.gz
+# Redhat/Fedora
+DISTRO = $(shell head -1 /etc/redhat-release | awk \
+ '{if ($$0 ~ /Fedora/) {print "fc"} else if ($$0 ~ /CentOS release 5/) {print "el5"} else if ($$0 ~ /CentOS release 6/) {print "el6"}}' )
+PKGNAME = $(RELEASE_NAME)-$(RELEASE)-$(DISTRO)-$(PLATFORM).tar.gz
endif
endif
ifeq ($(OS),SunOS)
Please sign in to comment.
Something went wrong with that request. Please try again.