[pulseaudio-discuss,paprefs] build-sys: don't reference README when lynx is disabled

Submitted by Tanu Kaskinen on Feb. 19, 2017, 11:06 a.m.

Details

Message ID 20170219110636.5718-1-tanuk@iki.fi
State New
Headers show
Series "build-sys: don't reference README when lynx is disabled" ( rev: 1 ) in PulseAudio

Not browsing as part of any series.

Commit Message

Tanu Kaskinen Feb. 19, 2017, 11:06 a.m.
lynx is required for generating README, so building failed when lynx was
disabled.
---
 Makefile.am     | 11 ++++++++---
 doc/Makefile.am |  9 ++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

Patch hide | download patch | download mbox

diff --git a/Makefile.am b/Makefile.am
index 30b014c..6f14ab6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,6 @@ 
 EXTRA_DIST = \
 	m4/ChangeLog \
 	bootstrap.sh \
-	README \
 	LICENSE \
 	intltool-merge.in \
 	intltool-update.in \
@@ -26,14 +25,20 @@  EXTRA_DIST = \
 
 SUBDIRS=src doc po
 
-MAINTAINERCLEANFILES=README
-noinst_DATA = README
+MAINTAINERCLEANFILES =
+noinst_DATA =
 
+if USE_LYNX
 README:
 	rm -f README
 	$(MAKE) -C doc README
 	cd $(srcdir) && ln -s doc/README README
 
+EXTRA_DIST += README
+MAINTAINERCLEANFILES += README
+noinst_DATA += README
+endif
+
 homepage: all dist
 	test -d $$HOME/homepage/private
 	mkdir -p $$HOME/homepage/private/projects/paprefs
diff --git a/doc/Makefile.am b/doc/Makefile.am
index e38d737..15fd625 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -15,16 +15,19 @@ 
 # You should have received a copy of the GNU General Public License
 # along with paprefs. If not, see <http://www.gnu.org/licenses/>.
 
-noinst_DATA = README.html README
-EXTRA_DIST = $(noinst_DATA) style.css README.html.in
+noinst_DATA = README.html
+EXTRA_DIST = README.html style.css README.html.in
 
-MAINTAINERCLEANFILES = README README.html
+MAINTAINERCLEANFILES = README.html
 CLEANFILES =
 
 if USE_LYNX
 README: README.html
 	lynx --dump $^ | sed 's,file://localhost/.*/doc/README.html,README,' > $@
 
+noinst_DATA += README
+EXTRA_DIST += README
+MAINTAINERCLEANFILES += README
 CLEANFILES += README
 endif