[couchdb-pkg] 01/01: Makefile.nightly -> Makefile

[wo...@apache.org]

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 3aa72e8f515ebfcbdbdd2ee76ba6f65e9203fb6d
Author: Joan Touzet <jo...@atypical.net>
AuthorDate: Wed Jul 12 17:47:01 2017 -0400

    Makefile.nightly -> Makefile
---
 Makefile.nightly => Makefile | 8 ++++++--
 README.md                    | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Makefile.nightly b/Makefile
similarity index 90%
rename from Makefile.nightly
rename to Makefile
index 726f0b3..f7845d1 100644
--- a/Makefile.nightly
+++ b/Makefile
@@ -32,7 +32,8 @@ precise-prep:
 	sed -i 's/ --with=systemd//' $(DISTDIR)/debian/rules
 
 # Ubuntu 14.04
-trusty: debian
+# Need to work around missing erlang-* pkgs for 1:18.3-1
+trusty: find-couch-dist copy-debian trusty-fix-control update-changelog dpkg lintian
 
 # Ubuntu 16.04
 xenial: debian
@@ -57,12 +58,15 @@ find-couch-dist:
 	$(eval ORIGDISTDIR := $(shell cd $(COUCHDIR) && find . -type d -name apache-couchdb-\*))
 	$(eval NEWDIR := $(shell echo $(ORIGDISTDIR) | sed 's/.\/apache-couchdb/couchdb/'))
 	mv $(COUCHDIR)/$(ORIGDISTDIR) $(COUCHDIR)/$(NEWDIR)
-	$(eval DISTDIR := $(COUCHDIR)/$(NEWDIR))
+	$(eval DISTDIR := $(shell readlink -f $(COUCHDIR)/$(NEWDIR)))
 
 copy-debian:
 	rm -rf $(DISTDIR)/debian
 	cp -R debian $(DISTDIR)
 
+trusty-fix-control:
+	sed -i '/erlang-*/d' $(DISTDIR)/debian/control
+
 update-changelog:
 	cd $(DISTDIR) && dch -d $(DEBCHANGELOG)
 
diff --git a/README.md b/README.md
index bea4028..ed97d67 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ Quickstart:
 
 ```shell
 $ cd .. && git clone https://github.com/apache/couchdb
-$ cd couchdb-pkg && make -f Makefile.nightly build-couch $(lsb_release -cs)
+$ cd couchdb-pkg && make build-couch $(lsb_release -cs)
 ```
 
 # Feedback, Issues, Contributing

-- 
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.