You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by wo...@apache.org on 2017/07/20 18:20:38 UTC
[couchdb-pkg] 01/01: Do not create build directory in ~
This is an automated email from the ASF dual-hosted git repository.
wohali pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-pkg.git
commit 163565be59ebbd3439c7b3a7b35d2f257ec11d7a
Author: Joan Touzet <jo...@atypical.net>
AuthorDate: Thu Jul 20 03:08:16 2017 -0400
Do not create build directory in ~
---
Makefile | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/Makefile b/Makefile
index 6c3d21f..49c8c90 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,10 @@ precise-prep:
# Ubuntu 14.04
# Need to work around missing esl erlang-* pkgs for 1:18.3-1 :/
-trusty: find-couch-dist copy-debian trusty-prep update-changelog dpkg lintian
+# No lintian run because of bogus failure on
+# postrm-does-not-call-updaterc.d-for-init.d-script
+# See Ubuntu ufw changelog for why they disabled this check
+trusty: find-couch-dist copy-debian trusty-prep update-changelog dpkg
# see changelog for ubuntu ufw package, this is safe
trusty-prep:
@@ -79,26 +82,26 @@ lintian:
# ######################################
link-couch-dist:
- rm -rf ~/rpmbuild/BUILD
- ln -s $(DISTDIR) ~/rpmbuild/BUILD
+ rm -rf ../rpmbuild/BUILD
+ ln -s $(DISTDIR) ../rpmbuild/BUILD
$(eval VERSION := $(shell echo $(VERSION) | sed 's/-/\./'))
make-rpmbuild:
- rm -rf ~/rpmbuild
- mkdir -p ~/rpmbuild
- cp -R rpm/* ~/rpmbuild
+ rm -rf ../rpmbuild
+ mkdir -p ../rpmbuild
+ cp -R rpm/* ../rpmbuild
build-rpm:
- cd ~/rpmbuild && rpmbuild --verbose -bb SPECS/couchdb.spec --define "erlang_version $(ERLANG_VERSION)" --define '_version $(VERSION)'
+ cd ../rpmbuild && rpmbuild --verbose -bb SPECS/couchdb.spec --define "erlang_version $(ERLANG_VERSION)" --define '_version $(VERSION)' --buildroot=../rpmbuild
# ######################################
make-js185:
spectool -g -R rpm/SPECS/js-1.8.5.spec
- cd ~/rpmbuild && rpmbuild --verbose -bb SPECS/js-1.8.5.spec
+ cd ../rpmbuild && rpmbuild --verbose -bb SPECS/js-1.8.5.spec
install-js185:
- sudo rpm -i ~/rpmbuild/RPMS/x86_64/js-1*
- sudo rpm -i ~/rpmbuild/RPMS/x86_64/js-devel*
+ sudo rpm -i ../rpmbuild/RPMS/x86_64/js-1*
+ sudo rpm -i ../rpmbuild/RPMS/x86_64/js-devel*
rm-js185-rpms:
- rm -f ~/rpmbuild/RPMS/x86_64/js*
+ rm -f ../rpmbuild/RPMS/x86_64/js*
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.