andrew/cmdarg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes to Makefile

Browse Source
This commit is contained in:
Andrew Kesterson
2013-10-15 02:23:35 -04:00
parent 77d48c3425
commit e610d8732c
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Makefile
View File

@@ -6,6 +6,10 @@ SRPM=cmdarg-$(VERSION)-$(RELEASE).src.rpm
ifndef RHEL_VERSION
RHEL_VERSION=5
endif
ifeq ($(RHEL_VERSION),5)
MOCKFLAGS=--define "_source_filedigest_algorithm md5" --define "_binary_filedigest_algorithm md5"
endif
RPM=cmdarg-$(VERSION)-$(RELEASE).noarch.rpm
ifndef PREFIX
@@ -34,19 +38,8 @@ gitclean:
# --- End phony targets
# This was borrowed from distiller, and I think it's to prevent version.sh
# from updating unnecessarily
version.sh:
if [ ! -d .git ] && [ -f version.sh ]; then echo "No git, keeping old version.sh" ; fi ; \
if [ ! -d .git ] && [ ! -f version.sh ]; then echo "No git and no version.sh, you're boned"; exit 1; fi ; \
if [ -d .git ] ; then \
bash ./gitversion.sh > tmpversion.sh && \
VERSIONSHA=$$(openssl sha1 version.sh | cut -d = -f 2) ; \
TMPVERSIONSHA=$$(openssl sha1 tmpversion.sh | cut -d = -f 2) ; \
if [ ! -e version.sh ] || [ "$$VERSIONSHA" != "$$TMPVERSIONSHA" ]; then \
mv tmpversion.sh version.sh; \
fi; \
fi
gitversion.sh > version.sh
$(DISTFILE): version.sh
mkdir -p dist/
@@ -56,7 +49,7 @@ $(DISTFILE): version.sh
./dist/$(SRPM): $(DISTFILE)
rm -fr ./dist/$(SRPM)
mock --buildsrpm --spec $(SPECFILE) --sources ./dist/ --resultdir ./dist/ --define "version $(VERSION)" --define "release $(RELEASE)"
mock --buildsrpm --spec $(SPECFILE) $(MOCKFILE) --sources ./dist/ --resultdir ./dist/ --define "version $(VERSION)" --define "release $(RELEASE)"
./dist/$(RPM): ./dist/$(SRPM)
rm -fr ./dist/$(RPM)