Skip to content

Commit

Permalink
Merge pull request brianfrankcooper#28 in HSE/hse-ycsb from make-pack…
Browse files Browse the repository at this point in the history
…age-lrc to v0.17.0-lrc-hse

* commit 'ebe932f462211ccf097348a6ee201857f53dd6aa':
  Merge pull request brianfrankcooper#27 in HSE/hse-ycsb from make-package to v0.17.0-hse

(cherry picked from commit 943db6bdc7ad65383f3c29d4bae4ea9a6fcf54f2)
  • Loading branch information
TOM BLAMER committed Jul 29, 2020
1 parent e6fab39 commit 2352513
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,13 @@ else
DEB_TOPDIR:="/tmp/$(shell id -u -n)/debbuild"
endif

DISTRO_ID_LIKE := $(shell . /etc/os-release && echo $$ID_LIKE)
ifeq ($(DISTRO_ID_LIKE),debian)
PACKAGE_TARGET = deb
else
PACKAGE_TARGET = rpm
endif

JENKINS_BUILDNO?=0
REL_CANDIDATE?=FALSE

Expand Down Expand Up @@ -104,7 +111,7 @@ DEB_PKGNAME:=hse-ycsb-$(DEB_VERSION)_amd64
DEB_PKGDIR:=$(DEB_TOPDIR)/$(DEB_PKGNAME)
DEB_ROOTDIR:=$(DEB_TOPDIR)/$(DEB_PKGNAME)/opt/hse-ycsb

.PHONY: all check-hse cleansrcs dist help srcs rpm
.PHONY: all check-hse cleansrcs dist help srcs rpm deb
all: rpm

check-hse:
Expand Down Expand Up @@ -167,6 +174,7 @@ deb: dist
sed -i 's/@VERSION@/$(DEB_VERSION)/' $(DEB_PKGDIR)/DEBIAN/control
cd $(DEB_TOPDIR) && dpkg-deb -b $(DEB_PKGNAME)

package: $(PACKAGE_TARGET)

srcs: cleansrcs
mkdir -p $(TOPDIR)/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
Expand Down

0 comments on commit 2352513

Please sign in to comment.