4 files changed, 61 insertions, 12 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 2195783a..826198b1 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -11,19 +11,8 @@ EXTRA_DIST = index.html
 #######################################################
 
 install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(DOCDIR)
-	$(mkinstalldirs) $(DESTDIR)$(DOCDIR)/text
-	for file in txts/*.txt; do \
-	  $(INSTALL_DATA) $$file $(DESTDIR)$(DOCDIR)/text; \
-	done
-	$(mkinstalldirs) $(DESTDIR)$(DOCDIR)/pdf
-	for file in pdf/*.pdf; do \
-	  $(INSTALL_DATA) $$file $(DESTDIR)$(DOCDIR)/pdf; \
-	done
 	$(mkinstalldirs) $(DESTDIR)$(DOCDIR)/html
-	for file in html/*.html; do \
-	  $(INSTALL_DATA) $$file $(DESTDIR)$(DOCDIR)/html; \
-	done
+	install -m 644 $(srcdir)/index.html $(DESTDIR)$(DOCDIR)/html/
 
 releasedocs: all
 	mkdir -p $(top_builddir)/Linux-PAM-$(VERSION)-docs/html
diff --git a/doc/adg/Makefile.am b/doc/adg/Makefile.am
index 419a8c6b..57faa841 100644
--- a/doc/adg/Makefile.am
+++ b/doc/adg/Makefile.am
@@ -47,6 +47,26 @@ html/Linux-PAM_ADG.html: $(XMLS)
 	  http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl $<
 endif
 
+install-data-local:
+	$(mkinstalldirs) $(DESTDIR)$(DOCDIR)
+	$(mkinstalldirs) $(DESTDIR)$(DOCDIR)/txt
+	$(mkinstalldirs) $(DESTDIR)$(DOCDIR)/pdf
+	$(mkinstalldirs) $(DESTDIR)$(DOCDIR)/html
+	test -f html/Linux-PAM_ADG.html && \
+	    $(install_sh_DATA) html/Linux-PAM_ADG.html html/adg-*.html \
+		$(DESTDIR)$(DOCDIR)/html/ || \
+	    $(install_sh_DATA) $(srcdir)/html/Linux-PAM_ADG.html \
+		$(srcdir)/html/sag-*.html \
+		$(DESTDIR)$(DOCDIR)/html/
+	test -f Linux-PAM_ADG.txt && \
+	    $(install_sh_DATA) Linux-PAM_ADG.txt $(DESTDIR)$(DOCDIR)/txt/ || \
+	    $(install_sh_DATA) $(srcdir)/Linux-PAM_ADG.txt \
+		$(DESTDIR)$(DOCDIR)/txt/
+	test -f Linux-PAM_ADG.pdf && \
+	    $(install_sh_DATA) Linux-PAM_ADG.pdf $(DESTDIR)$(DOCDIR)/pdf/ || \
+	    $(install_sh_DATA) $(srcdir)/Linux-PAM_ADG.pdf \
+		$(DESTDIR)$(DOCDIR)/pdf/
+
 releasedocs: all
 	test -f html/Linux-PAM_ADG.html && \
 	    cp -ap html/Linux-PAM_ADG.html html/adg-*.html \
diff --git a/doc/mwg/Makefile.am b/doc/mwg/Makefile.am
index ee650f64..b9f19764 100644
--- a/doc/mwg/Makefile.am
+++ b/doc/mwg/Makefile.am
@@ -47,6 +47,26 @@ html/Linux-PAM_MWG.html: $(XMLS)
 	  http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl $<
 endif
 
+install-data-local:
+	$(mkinstalldirs) $(DESTDIR)$(DOCDIR)
+	$(mkinstalldirs) $(DESTDIR)$(DOCDIR)/txt
+	$(mkinstalldirs) $(DESTDIR)$(DOCDIR)/pdf
+	$(mkinstalldirs) $(DESTDIR)$(DOCDIR)/html
+	test -f html/Linux-PAM_MWG.html && \
+	    $(install_sh_DATA) html/Linux-PAM_MWG.html html/mwg-*.html \
+		$(DESTDIR)$(DOCDIR)/html/ || \
+	    $(install_sh_DATA) $(srcdir)/html/Linux-PAM_MWG.html \
+		$(srcdir)/html/sag-*.html \
+		$(DESTDIR)$(DOCDIR)/html/
+	test -f Linux-PAM_MWG.txt && \
+	    $(install_sh_DATA) Linux-PAM_MWG.txt $(DESTDIR)$(DOCDIR)/txt/ || \
+	    $(install_sh_DATA) $(srcdir)/Linux-PAM_MWG.txt \
+		$(DESTDIR)$(DOCDIR)/txt/
+	test -f Linux-PAM_MWG.pdf && \
+	    $(install_sh_DATA) Linux-PAM_MWG.pdf $(DESTDIR)$(DOCDIR)/pdf/ || \
+	    $(install_sh_DATA) $(srcdir)/Linux-PAM_MWG.pdf \
+		$(DESTDIR)$(DOCDIR)/pdf/
+
 releasedocs: all
 	test -f html/Linux-PAM_MWG.html && \
 	    cp -ap html/Linux-PAM_MWG.html html/mwg-*.html \
diff --git a/doc/sag/Makefile.am b/doc/sag/Makefile.am
index 2e81709b..71f2d689 100644
--- a/doc/sag/Makefile.am
+++ b/doc/sag/Makefile.am
@@ -47,6 +47,26 @@ html/Linux-PAM_SAG.html: $(XMLS)
 	  http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl $<
 endif
 
+install-data-local:
+	$(mkinstalldirs) $(DESTDIR)$(DOCDIR)
+	$(mkinstalldirs) $(DESTDIR)$(DOCDIR)/txt
+	$(mkinstalldirs) $(DESTDIR)$(DOCDIR)/pdf
+	$(mkinstalldirs) $(DESTDIR)$(DOCDIR)/html
+	test -f html/Linux-PAM_SAG.html && \
+	    $(install_sh_DATA) html/Linux-PAM_SAG.html html/sag-*.html \
+		$(DESTDIR)$(DOCDIR)/html/ || \
+	    $(install_sh_DATA) $(srcdir)/html/Linux-PAM_SAG.html \
+		$(srcdir)/html/sag-*.html \
+		$(DESTDIR)$(DOCDIR)/html/
+	test -f Linux-PAM_SAG.txt && \
+	    $(install_sh_DATA) Linux-PAM_SAG.txt $(DESTDIR)$(DOCDIR)/txt/ || \
+	    $(install_sh_DATA) $(srcdir)/Linux-PAM_SAG.txt \
+		$(DESTDIR)$(DOCDIR)/txt/
+	test -f Linux-PAM_SAG.pdf && \
+	    $(install_sh_DATA) Linux-PAM_SAG.pdf $(DESTDIR)$(DOCDIR)/pdf/ || \
+	    $(install_sh_DATA) $(srcdir)/Linux-PAM_SAG.pdf \
+		$(DESTDIR)$(DOCDIR)/pdf/
+
 releasedocs: all
 	test -f html/Linux-PAM_SAG.html && \
 	    cp -ap html/Linux-PAM_SAG.html html/sag-*.html \