packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Makefile.dist-packaging: fix make rpm with submodules 

Makefile.dist-packaging seems to assume to be run under packaging/ as
"make -C packaging -f Makefile.dist-packaging rpm" so ensure the
srcdir is set correctly to point to the parent directory.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano 2015-03-02 11:39:51 +01:00 committed by Colin Walters
parent 494d3535e4
commit 9843c4c245
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packaging/Makefile.dist-packaging
View File

@ -3,7 +3,7 @@
GITREV = $$(git describe --always --tags) GITREV = $$(git describe --always --tags)
GITREV_FOR_PKG = $(shell echo "$(GITREV)" | sed -e 's,-,\.,g' -e 's,^v,,') GITREV_FOR_PKG = $(shell echo "$(GITREV)" | sed -e 's,-,\.,g' -e 's,^v,,')
srcdir=$(shell pwd) srcdir=$(shell dirname `pwd`)
PACKAGE=ostree PACKAGE=ostree
PKG_VER = $(PACKAGE)-$(GITREV_FOR_PKG) PKG_VER = $(PACKAGE)-$(GITREV_FOR_PKG)
@ -30,4 +30,4 @@ srpm: dist-snapshot
./rpmbuild-cwd -bs $(PACKAGE).spec ./rpmbuild-cwd -bs $(PACKAGE).spec
rpm: srpm rpm: srpm
$(srcdir)/rpmbuild-cwd --rebuild $(PKG_VER)*.src.rpm ./rpmbuild-cwd --rebuild $(PKG_VER)*.src.rpm