keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Makefile.dist-packaging: fix make rpm with submodules

Browse Source 
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 12:35:18 +01:00
parent 4118617666
commit e927f90de1
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_FOR_PKG = $(shell echo "$(GITREV)" | sed -e 's,-,\.,g' -e 's,^v,,')
srcdir=$(shell pwd)
srcdir=$(shell dirname `pwd`)
PACKAGE=rpm-ostree
PKG_VER = $(PACKAGE)-$(GITREV_FOR_PKG)
@ -29,4 +29,4 @@ srpm: dist-snapshot
./rpmbuild-cwd -bs $(PACKAGE).spec
rpm: srpm
$(srcdir)/rpmbuild-cwd --rebuild $(PKG_VER)*.src.rpm
./rpmbuild-cwd --rebuild $(PKG_VER)*.src.rpm