[Pam-developers] [PATCH] doc: fix install in case of out of tree build (ticket #31)

Sunday, 22 June 2014

* doc/adg/Makefile.am (install-data-local, releasedocs): Fall back
to srcdir if documentation files haven't been found in builddir.
(releasedocs): Treat missing documentation files as an error.
* doc/mwg/Makefile.am: Likewise.
* doc/sag/Makefile.am: Likewise.
---
 doc/adg/Makefile.am | 51 +++++++++++++++++++++++++++++++++------------------
 doc/mwg/Makefile.am | 51 +++++++++++++++++++++++++++++++++------------------
 doc/sag/Makefile.am | 51 +++++++++++++++++++++++++++++++++------------------
 3 files changed, 99 insertions(+), 54 deletions(-)

diff --git a/doc/adg/Makefile.am b/doc/adg/Makefile.am
index aedc033..77bd7a9 100644
--- a/doc/adg/Makefile.am
+++ b/doc/adg/Makefile.am
@@ -57,20 +57,26 @@ install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(docdir)
 	$(mkinstalldirs) $(DESTDIR)$(pdfdir)
 	$(mkinstalldirs) $(DESTDIR)$(htmldir)
-	test -f html/Linux-PAM_ADG.html || exit 0; \
+	if test -f html/Linux-PAM_ADG.html; then \
 	    $(install_sh_DATA) html/Linux-PAM_ADG.html html/adg-*.html \
-		$(DESTDIR)$(htmldir)/ || \
+		$(DESTDIR)$(htmldir)/; \
+	elif test -f $(srcdir)/html/Linux-PAM_ADG.html; then \
 	    $(install_sh_DATA) $(srcdir)/html/Linux-PAM_ADG.html \
 		$(srcdir)/html/adg-*.html \
-		$(DESTDIR)$(htmldir)/
-	test -f Linux-PAM_ADG.txt || exit 0; \
-	    $(install_sh_DATA) Linux-PAM_ADG.txt $(DESTDIR)$(docdir)/ || \
+		$(DESTDIR)$(htmldir)/; \
+	fi
+	if test -f Linux-PAM_ADG.txt; then \
+	    $(install_sh_DATA) Linux-PAM_ADG.txt $(DESTDIR)$(docdir)/; \
+	elif test -f $(srcdir)/Linux-PAM_ADG.txt; then \
 	    $(install_sh_DATA) $(srcdir)/Linux-PAM_ADG.txt \
-		$(DESTDIR)$(docdir)/
-	test -f Linux-PAM_ADG.pdf || exit 0; \
-	    $(install_sh_DATA) Linux-PAM_ADG.pdf $(DESTDIR)$(pdfdir)/ || \
+		$(DESTDIR)$(docdir)/; \
+	fi
+	if test -f Linux-PAM_ADG.pdf; then \
+	    $(install_sh_DATA) Linux-PAM_ADG.pdf $(DESTDIR)$(pdfdir)/; \
+	elif test -f $(srcdir)/Linux-PAM_ADG.pdf; then \
 	    $(install_sh_DATA) $(srcdir)/Linux-PAM_ADG.pdf \
-		$(DESTDIR)$(pdfdir)/
+		$(DESTDIR)$(pdfdir)/; \
+	fi
 
 uninstall-local:
 	-rm $(DESTDIR)$(htmldir)/Linux-PAM_ADG.html
@@ -80,19 +86,28 @@ uninstall-local:
 
 releasedocs: all
 	$(mkinstalldirs) $(top_builddir)/Linux-PAM-$(VERSION)/doc/adg/html
-	test -f html/Linux-PAM_ADG.html || exit 0; \
+	if test -f html/Linux-PAM_ADG.html; then \
 	    cp -ap html/Linux-PAM_ADG.html html/adg-*.html \
-		$(top_builddir)/Linux-PAM-$(VERSION)/doc/adg/html/ || \
+		$(top_builddir)/Linux-PAM-$(VERSION)/doc/adg/html/; \
+	elif test -f $(srcdir)/html/Linux-PAM_ADG.html; then \
 	    cp -ap $(srcdir)/html/Linux-PAM_ADG.html \
 		$(srcdir)/html/adg-*.html \
-		$(top_builddir)/Linux-PAM-$(VERSION)/doc/adg/html/
-	test -f Linux-PAM_ADG.txt || exit 0; \
+		$(top_builddir)/Linux-PAM-$(VERSION)/doc/adg/html/; \
+	else exit 1; \
+	fi
+	if test -f Linux-PAM_ADG.txt; then \
 	    cp -p Linux-PAM_ADG.txt \
-		$(top_builddir)/Linux-PAM-$(VERSION)/doc/adg/ || \
+		$(top_builddir)/Linux-PAM-$(VERSION)/doc/adg/; \
+	elif test -f $(srcdir)/Linux-PAM_ADG.txt; then \
 	    cp -p $(srcdir)/Linux-PAM_ADG.txt \
-		$(top_builddir)/Linux-PAM-$(VERSION)/doc/adg/
-	test -f Linux-PAM_ADG.pdf || exit 0; \
+		$(top_builddir)/Linux-PAM-$(VERSION)/doc/adg/; \
+	else exit 1; \
+	fi
+	if test -f Linux-PAM_ADG.pdf; then \
 	    cp -p Linux-PAM_ADG.pdf \
-		$(top_builddir)/Linux-PAM-$(VERSION)/doc/adg/ || \
+		$(top_builddir)/Linux-PAM-$(VERSION)/doc/adg/; \
+	elif test -f $(srcdir)/Linux-PAM_ADG.pdf; then \
 	    cp -p $(srcdir)/Linux-PAM_ADG.pdf \
-		$(top_builddir)/Linux-PAM-$(VERSION)/doc/adg/
+		$(top_builddir)/Linux-PAM-$(VERSION)/doc/adg/; \
+	else exit 1; \
+	fi
diff --git a/doc/mwg/Makefile.am b/doc/mwg/Makefile.am
index 1154036..2bbb2d0 100644
--- a/doc/mwg/Makefile.am
+++ b/doc/mwg/Makefile.am
@@ -57,20 +57,26 @@ install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(docdir)
 	$(mkinstalldirs) $(DESTDIR)$(pdfdir)
 	$(mkinstalldirs) $(DESTDIR)$(htmldir)
-	test -f html/Linux-PAM_MWG.html || exit 0; \
+	if test -f html/Linux-PAM_MWG.html; then \
 	    $(install_sh_DATA) html/Linux-PAM_MWG.html html/mwg-*.html \
-		$(DESTDIR)$(htmldir)/ || \
+		$(DESTDIR)$(htmldir)/; \
+	elif test -f $(srcdir)/html/Linux-PAM_MWG.html; then \
 	    $(install_sh_DATA) $(srcdir)/html/Linux-PAM_MWG.html \
 		$(srcdir)/html/mwg-*.html \
-		$(DESTDIR)$(htmldir)/
-	test -f Linux-PAM_MWG.txt || exit 0; \
-	    $(install_sh_DATA) Linux-PAM_MWG.txt $(DESTDIR)$(docdir)/ || \
+		$(DESTDIR)$(htmldir)/; \
+	fi
+	if test -f Linux-PAM_MWG.txt; then \
+	    $(install_sh_DATA) Linux-PAM_MWG.txt $(DESTDIR)$(docdir)/; \
+	elif test -f $(srcdir)/Linux-PAM_MWG.txt; then \
 	    $(install_sh_DATA) $(srcdir)/Linux-PAM_MWG.txt \
-		$(DESTDIR)$(docdir)/
-	test -f Linux-PAM_MWG.pdf || exit 0; \
-	    $(install_sh_DATA) Linux-PAM_MWG.pdf $(DESTDIR)$(pdfdir)/ || \
+		$(DESTDIR)$(docdir)/; \
+	fi
+	if test -f Linux-PAM_MWG.pdf; then \
+	    $(install_sh_DATA) Linux-PAM_MWG.pdf $(DESTDIR)$(pdfdir)/; \
+	elif test -f $(srcdir)/Linux-PAM_MWG.pdf; then \
 	    $(install_sh_DATA) $(srcdir)/Linux-PAM_MWG.pdf \
-		$(DESTDIR)$(pdfdir)/
+		$(DESTDIR)$(pdfdir)/; \
+	fi
 
 uninstall-local:
 	-rm $(DESTDIR)$(htmldir)/Linux-PAM_MWG.html
@@ -80,19 +86,28 @@ uninstall-local:
 
 releasedocs: all
 	$(mkinstalldirs) $(top_builddir)/Linux-PAM-$(VERSION)/doc/mwg/html
-	test -f html/Linux-PAM_MWG.html || exit 0; \
+	if test -f html/Linux-PAM_MWG.html; then \
 	    cp -ap html/Linux-PAM_MWG.html html/mwg-*.html \
-		$(top_builddir)/Linux-PAM-$(VERSION)/doc/mwg/html/ || \
+		$(top_builddir)/Linux-PAM-$(VERSION)/doc/mwg/html/; \
+	elif test -f $(srcdir)/html/Linux-PAM_MWG.html; then \
 	    cp -ap $(srcdir)/html/Linux-PAM_MWG.html \
 		$(srcdir)/html/mwg-*.html \
-		$(top_builddir)/Linux-PAM-$(VERSION)/doc/mwg/html/
-	test -f Linux-PAM_MWG.txt || exit 0; \
+		$(top_builddir)/Linux-PAM-$(VERSION)/doc/mwg/html/; \
+	else exit 1; \
+	fi
+	if test -f Linux-PAM_MWG.txt; then \
 	    cp -p Linux-PAM_MWG.txt \
-		$(top_builddir)/Linux-PAM-$(VERSION)/doc/mwg/ || \
+		$(top_builddir)/Linux-PAM-$(VERSION)/doc/mwg/; \
+	elif test -f $(srcdir)/Linux-PAM_MWG.txt; then \
 	    cp -p $(srcdir)/Linux-PAM_MWG.txt \
-		$(top_builddir)/Linux-PAM-$(VERSION)/doc/mwg/
-	test -f Linux-PAM_MWG.pdf || exit 0; \
+		$(top_builddir)/Linux-PAM-$(VERSION)/doc/mwg/; \
+	else exit 1; \
+	fi
+	if test -f Linux-PAM_MWG.pdf; then \
 	    cp -p Linux-PAM_MWG.pdf \
-		$(top_builddir)/Linux-PAM-$(VERSION)/doc/mwg/ || \
+		$(top_builddir)/Linux-PAM-$(VERSION)/doc/mwg/; \
+	elif test -f $(srcdir)/Linux-PAM_MWG.pdf; then \
 	    cp -p $(srcdir)/Linux-PAM_MWG.pdf \
-		$(top_builddir)/Linux-PAM-$(VERSION)/doc/mwg/
+		$(top_builddir)/Linux-PAM-$(VERSION)/doc/mwg/; \
+	else exit 1; \
+	fi
diff --git a/doc/sag/Makefile.am b/doc/sag/Makefile.am
index 35b1669..31816aa 100644
--- a/doc/sag/Makefile.am
+++ b/doc/sag/Makefile.am
@@ -57,20 +57,26 @@ install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(docdir)
 	$(mkinstalldirs) $(DESTDIR)$(pdfdir)
 	$(mkinstalldirs) $(DESTDIR)$(htmldir)
-	test -f html/Linux-PAM_SAG.html || exit 0; \
+	if test -f html/Linux-PAM_SAG.html; then \
 	    $(install_sh_DATA) html/Linux-PAM_SAG.html html/sag-*.html \
-		$(DESTDIR)$(htmldir)/ || \
+		$(DESTDIR)$(htmldir)/; \
+	elif test -f $(srcdir)/html/Linux-PAM_SAG.html; then \
 	    $(install_sh_DATA) $(srcdir)/html/Linux-PAM_SAG.html \
 		$(srcdir)/html/sag-*.html \
-		$(DESTDIR)$(htmldir)/
-	test -f Linux-PAM_SAG.txt || exit 0; \
-	    $(install_sh_DATA) Linux-PAM_SAG.txt $(DESTDIR)$(docdir)/ || \
+		$(DESTDIR)$(htmldir)/; \
+	fi
+	if test -f Linux-PAM_SAG.txt; then \
+	    $(install_sh_DATA) Linux-PAM_SAG.txt $(DESTDIR)$(docdir)/; \
+	elif test -f $(srcdir)/Linux-PAM_SAG.txt; then \
 	    $(install_sh_DATA) $(srcdir)/Linux-PAM_SAG.txt \
-		$(DESTDIR)$(docdir)/
-	test -f Linux-PAM_SAG.pdf || exit 0; \
-	    $(install_sh_DATA) Linux-PAM_SAG.pdf $(DESTDIR)$(pdfdir)/ || \
+		$(DESTDIR)$(docdir)/; \
+	fi
+	if test -f Linux-PAM_SAG.pdf; then \
+	    $(install_sh_DATA) Linux-PAM_SAG.pdf $(DESTDIR)$(pdfdir)/; \
+	elif test -f $(srcdir)/Linux-PAM_SAG.pdf; then \
 	    $(install_sh_DATA) $(srcdir)/Linux-PAM_SAG.pdf \
-		$(DESTDIR)$(pdfdir)/
+		$(DESTDIR)$(pdfdir)/; \
+	fi
 
 uninstall-local:
 	-rm $(DESTDIR)$(htmldir)/Linux-PAM_SAG.html
@@ -80,19 +86,28 @@ uninstall-local:
 
 releasedocs: all
 	$(mkinstalldirs) $(top_builddir)/Linux-PAM-$(VERSION)/doc/sag/html
-	test -f html/Linux-PAM_SAG.html || exit 0; \
+	if test -f html/Linux-PAM_SAG.html; then \
 	    cp -ap html/Linux-PAM_SAG.html html/sag-*.html \
-		$(top_builddir)/Linux-PAM-$(VERSION)/doc/sag/html/ || \
+		$(top_builddir)/Linux-PAM-$(VERSION)/doc/sag/html/; \
+	elif test -f $(srcdir)/html/Linux-PAM_SAG.html; then \
 	    cp -ap $(srcdir)/html/Linux-PAM_SAG.html \
 		$(srcdir)/html/sag-*.html \
-		$(top_builddir)/Linux-PAM-$(VERSION)/doc/sag/html/
-	test -f Linux-PAM_SAG.txt || exit 0; \
+		$(top_builddir)/Linux-PAM-$(VERSION)/doc/sag/html/; \
+	else exit 1; \
+	fi
+	if test -f Linux-PAM_SAG.txt; then \
 	    cp -p Linux-PAM_SAG.txt \
-		$(top_builddir)/Linux-PAM-$(VERSION)/doc/sag/ || \
+		$(top_builddir)/Linux-PAM-$(VERSION)/doc/sag/; \
+	elif test -f $(srcdir)/Linux-PAM_SAG.txt; then \
 	    cp -p $(srcdir)/Linux-PAM_SAG.txt \
-		$(top_builddir)/Linux-PAM-$(VERSION)/doc/sag/
-	test -f Linux-PAM_SAG.pdf || exit 0; \
+		$(top_builddir)/Linux-PAM-$(VERSION)/doc/sag/; \
+	else exit 1; \
+	fi
+	if test -f Linux-PAM_SAG.pdf; then \
 	    cp -p Linux-PAM_SAG.pdf \
-		$(top_builddir)/Linux-PAM-$(VERSION)/doc/sag/ || \
+		$(top_builddir)/Linux-PAM-$(VERSION)/doc/sag/; \
+	elif test -f $(srcdir)/Linux-PAM_SAG.pdf; then \
 	    cp -p $(srcdir)/Linux-PAM_SAG.pdf \
-		$(top_builddir)/Linux-PAM-$(VERSION)/doc/sag/
+		$(top_builddir)/Linux-PAM-$(VERSION)/doc/sag/; \
+	else exit 1; \
+	fi
-- 
ldv

    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

[Pam-developers] [PATCH] doc: fix install in case of out of tree build (ticket #31)