[pulseaudio-commits] 2 commits - doc/Makefile.am Makefile.am

[Arun Raghavan]

 Makefile.am     |   11 ++++++-----
 doc/Makefile.am |    6 ++++--
 2 files changed, 10 insertions(+), 7 deletions(-)

New commits:
commit 015c06042b2abfb3e867fcd9813656a9057a8060
Author: Arun Raghavan <git at arunraghavan.net>
Date:   Mon Mar 23 23:35:39 2015 +0530

    build-sys: Don't dist m4/ChangeLog
    
    Doesn't exist, and if it did, would likely be irrelevant.

diff --git a/Makefile.am b/Makefile.am
index c03650d..a387352 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,6 @@
 # along with pavucontrol. If not, see <http://www.gnu.org/licenses/>.
 
 EXTRA_DIST = \
-	m4/ChangeLog \
 	bootstrap.sh \
 	LICENSE \
 	intltool-merge.in \

commit 2505798a84d0f653accd0d9610fa99743f47962c
Author: Arun Raghavan <git at arunraghavan.net>
Date:   Mon Mar 23 23:34:43 2015 +0530

    build-sys: Fix README building
    
    Fixes for out-of-tree build, as well as making --disable-lynx work
    correctly. Note that make dist will fail if lynx support is disabled (as
    it should, since README will then not be available to put in the
    tarball).

diff --git a/Makefile.am b/Makefile.am
index 79eb53a..c03650d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,20 +18,22 @@
 EXTRA_DIST = \
 	m4/ChangeLog \
 	bootstrap.sh \
-	README LICENSE \
+	LICENSE \
 	intltool-merge.in \
 	intltool-update.in \
 	intltool-extract.in
 
 SUBDIRS=src doc po
 
-MAINTAINERCLEANFILES=README
+if USE_LYNX
+EXTRA_DIST += README
+MAINTAINERCLEANFILES = README
 noinst_DATA = README
 
 README:
-	rm -f README
 	$(MAKE) -C doc README
-	cd $(srcdir) && ln -s doc/README README
+	ln -sf doc/README $(builddir)
+endif
 
 homepage: all dist
 	test -d $$HOME/homepage/private
diff --git a/doc/Makefile.am b/doc/Makefile.am
index d4b50be..df81fdf 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -17,16 +17,18 @@
 # <http://www.gnu.org/licenses/>.
 
 dist_html_DATA = README.html style.css
-dist_doc_DATA = README
 EXTRA_DIST = README.html.in
 
-MAINTAINERCLEANFILES = README README.html
+MAINTAINERCLEANFILES = README.html
 CLEANFILES =
 
 if USE_LYNX
+dist_doc_DATA = README
+
 README: README.html
 	lynx --dump $^ | sed 's,file://localhost/.*/doc/README.html,README,' > $@
 
+MAINTAINERCLEANFILES += README
 CLEANFILES += README
 endif