[ostree] Makefile.dist-packaging: fix make rpm with submodules
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ostree] Makefile.dist-packaging: fix make rpm with submodules
- Date: Tue, 3 Mar 2015 23:46:59 +0000 (UTC)
commit 9843c4c2456b82b2bf857235e5b6e6460618a272
Author: Giuseppe Scrivano <gscrivan redhat com>
Date: Mon Mar 2 11:39:51 2015 +0100
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>
packaging/Makefile.dist-packaging | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/packaging/Makefile.dist-packaging b/packaging/Makefile.dist-packaging
index 103b1e8..e1389eb 100644
--- a/packaging/Makefile.dist-packaging
+++ b/packaging/Makefile.dist-packaging
@@ -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=ostree
PKG_VER = $(PACKAGE)-$(GITREV_FOR_PKG)
@@ -30,4 +30,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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]