Relevant BUGIDs:

Purpose of commit: bugfix

Commit summary:
---------------

2006-06-29  Thorsten Kukuk  <kukuk@thkukuk.de>

        * doc/Makefile.am (releasedocs): Fix directory layout.
        * doc/adg/Makefile.am: Likewise.
        * doc/mwg/Makefile.am: Likewise.
        * doc/sag/Makefile.am: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 11c0f0230bd65f5551b089bac67721704e1006d1..fd9e33315295e3708ef20b7d1456664ec35649cb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-29  Thorsten Kukuk  <kukuk@thkukuk.de>
+
+       * doc/Makefile.am (releasedocs): Fix directory layout.
+       * doc/adg/Makefile.am: Likewise.
+       * doc/mwg/Makefile.am: Likewise.
+       * doc/sag/Makefile.am: Likewise.
+
 2006-06-28  Thorsten Kukuk  <kukuk@thkukuk.de>
 
        * doc/sag: System Administrator Guide as XML source.

diff --git a/Makefile.am b/Makefile.am
index 9dbe47bcf2813f8c774bc06e67de68bef635a8e5..572505650d190f33f1306dc96c72bc4980afabe8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,11 +24,11 @@ release: dist releasedocs
 release-docs: releasedocs
 
 releasedocs: 
-       rm -rf Linux-PAM-$(VERSION)-docs
-       mkdir -p Linux-PAM-$(VERSION)-docs
+       rm -rf Linux-PAM-$(VERSION)
+       mkdir -p Linux-PAM-$(VERSION)/doc
        make -C doc releasedocs
        tar zfc Linux-PAM-$(VERSION)-docs.tar.gz \
-               Linux-PAM-$(VERSION)-docs/*
+               Linux-PAM-$(VERSION)/doc
        tar jfc Linux-PAM-$(VERSION)-docs.tar.bz2 \
-               Linux-PAM-$(VERSION)-docs/*
-       rm -rf Linux-PAM-$(VERSION)-docs 
+               Linux-PAM-$(VERSION)/doc
+       rm -rf Linux-PAM-$(VERSION)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 826198b1ffdb41a707c01b262d0f947620f37a29..31085a5ccaeef24d923408bf644067ddbee92942 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -15,16 +15,11 @@ install-data-local:
        install -m 644 $(srcdir)/index.html $(DESTDIR)$(DOCDIR)/html/
 
 releasedocs: all
-       mkdir -p $(top_builddir)/Linux-PAM-$(VERSION)-docs/html
-       mkdir -p $(top_builddir)/Linux-PAM-$(VERSION)-docs/pdf
-       mkdir -p $(top_builddir)/Linux-PAM-$(VERSION)-docs/txt
-       mkdir -p $(top_builddir)/Linux-PAM-$(VERSION)-docs/specs
-       cp -av $(srcdir)/index.html \
-               $(top_builddir)/Linux-PAM-$(VERSION)-docs/html/
+       $(mkinstalldirs) $(top_builddir)/Linux-PAM-$(VERSION)/doc/specs
        cp -av specs/draft-morgan-pam-current.txt \
-               $(top_builddir)/Linux-PAM-$(VERSION)-docs/specs/
+               $(top_builddir)/Linux-PAM-$(VERSION)/doc/specs/
        cp -av specs/rfc86.0.txt \
-               $(top_builddir)/Linux-PAM-$(VERSION)-docs/specs/
+               $(top_builddir)/Linux-PAM-$(VERSION)/doc/specs/
        make -C sag releasedocs
        make -C adg releasedocs
        make -C mwg releasedocs

diff --git a/doc/adg/Makefile.am b/doc/adg/Makefile.am
index 57faa8417f2e6462c13b525164acb7bdfaaa4e7e..7ba2ab0d00162757741a24b7c3513c6bd1588714 100644 (file)
--- a/doc/adg/Makefile.am
+++ b/doc/adg/Makefile.am
@@ -68,19 +68,20 @@ install-data-local:
                $(DESTDIR)$(DOCDIR)/pdf/
 
 releasedocs: all
+       $(mkinstalldirs) $(top_builddir)/Linux-PAM-$(VERSION)/doc/adg/html
        test -f html/Linux-PAM_ADG.html && \
            cp -ap html/Linux-PAM_ADG.html html/adg-*.html \
-               $(top_builddir)/Linux-PAM-$(VERSION)-docs/html/ || \
+               $(top_builddir)/Linux-PAM-$(VERSION)/doc/adg/html/ || \
            cp -ap $(srcdir)/html/Linux-PAM_ADG.html \
                $(srcdir)/html/adg-*.html \
-               $(top_builddir)/Linux-PAM-$(VERSION)-docs/html/
+               $(top_builddir)/Linux-PAM-$(VERSION)/doc/adg/html/
        test -f Linux-PAM_ADG.txt && \
            cp -p Linux-PAM_ADG.txt \
-               $(top_builddir)/Linux-PAM-$(VERSION)-docs/txt/ || \
+               $(top_builddir)/Linux-PAM-$(VERSION)/doc/adg/ || \
            cp -p $(srcdir)/Linux-PAM_ADG.txt \
-               $(top_builddir)/Linux-PAM-$(VERSION)-docs/txt/
+               $(top_builddir)/Linux-PAM-$(VERSION)/doc/adg/
        test -f Linux-PAM_ADG.pdf && \
            cp -p Linux-PAM_ADG.pdf \
-               $(top_builddir)/Linux-PAM-$(VERSION)-docs/pdf/ || \
+               $(top_builddir)/Linux-PAM-$(VERSION)/doc/adg/ || \
            cp -p $(srcdir)/Linux-PAM_ADG.pdf \
-               $(top_builddir)/Linux-PAM-$(VERSION)-docs/pdf/
+               $(top_builddir)/Linux-PAM-$(VERSION)/doc/adg/

diff --git a/doc/html/.cvsignore b/doc/html/.cvsignore
deleted file mode 100644 (file)
index 6bd399c..0000000
--- a/doc/html/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-pam*.html
-Makefile
-Makefile.in
-

diff --git a/doc/html/index.html b/doc/html/index.html
deleted file mode 100644 (file)
index 1ffd7e3..0000000
--- a/doc/html/index.html
+++ /dev/null
@@ -1,21 +0,0 @@
-
-<HTML>
-<HEAD>
-<TITLE>Linux-PAM - Pluggable Authentication Modules for Linux</TITLE>
-</HEAD>
-<BODY>
-
-<p>
-Here is the documentation for Linux-PAM. As you will see it is
-currently not complete. However, in order of decreasing length:
-
-<ul>
-<li> <a href="pam.html">The System Administrators' Guide</a>
-<li> <a href="pam_modules.html">The Module Writers' Manual</a>
-<li> <a href="pam_appl.html">The Application developers' Manual</a>
-</ul>
-
-<hr>
-<p>
-REVISION: <tt>$Id$</tt>
-</BODY>

diff --git a/doc/mwg/Makefile.am b/doc/mwg/Makefile.am
index b9f197644e4fb619ba5df3cf8baa2e1050a7fa1e..f1b452f143e3039fb182b6974b070a6942c1bbd5 100644 (file)
--- a/doc/mwg/Makefile.am
+++ b/doc/mwg/Makefile.am
@@ -68,19 +68,20 @@ install-data-local:
                $(DESTDIR)$(DOCDIR)/pdf/
 
 releasedocs: all
+       $(mkinstalldirs) $(top_builddir)/Linux-PAM-$(VERSION)/doc/mwg/html
        test -f html/Linux-PAM_MWG.html && \
            cp -ap html/Linux-PAM_MWG.html html/mwg-*.html \
-               $(top_builddir)/Linux-PAM-$(VERSION)-docs/html/ || \
+               $(top_builddir)/Linux-PAM-$(VERSION)/doc/mwg/html/ || \
            cp -ap $(srcdir)/html/Linux-PAM_MWG.html \
                $(srcdir)/html/mwg-*.html \
-               $(top_builddir)/Linux-PAM-$(VERSION)-docs/html/
+               $(top_builddir)/Linux-PAM-$(VERSION)/doc/mwg/html/
        test -f Linux-PAM_MWG.txt && \
            cp -p Linux-PAM_MWG.txt \
-               $(top_builddir)/Linux-PAM-$(VERSION)-docs/txt/ || \
+               $(top_builddir)/Linux-PAM-$(VERSION)/doc/mwg/ || \
            cp -p $(srcdir)/Linux-PAM_MWG.txt \
-               $(top_builddir)/Linux-PAM-$(VERSION)-docs/txt/
+               $(top_builddir)/Linux-PAM-$(VERSION)/doc/mwg/
        test -f Linux-PAM_MWG.pdf && \
            cp -p Linux-PAM_MWG.pdf \
-               $(top_builddir)/Linux-PAM-$(VERSION)-docs/pdf/ || \
+               $(top_builddir)/Linux-PAM-$(VERSION)/doc/mwg/ || \
            cp -p $(srcdir)/Linux-PAM_MWG.pdf \
-               $(top_builddir)/Linux-PAM-$(VERSION)-docs/pdf/
+               $(top_builddir)/Linux-PAM-$(VERSION)/doc/mwg/

diff --git a/doc/sag/Makefile.am b/doc/sag/Makefile.am
index 71f2d6895ed8194f8de78cbf153ef596b7dff903..1efc6d4eb8157839933793b23a629cab71de3065 100644 (file)
--- a/doc/sag/Makefile.am
+++ b/doc/sag/Makefile.am
@@ -68,19 +68,20 @@ install-data-local:
                $(DESTDIR)$(DOCDIR)/pdf/
 
 releasedocs: all
+       $(mkinstalldirs) $(top_builddir)/Linux-PAM-$(VERSION)/doc/sag/html
        test -f html/Linux-PAM_SAG.html && \
            cp -ap html/Linux-PAM_SAG.html html/sag-*.html \
-               $(top_builddir)/Linux-PAM-$(VERSION)-docs/html/ || \
+               $(top_builddir)/Linux-PAM-$(VERSION)/doc/sag/html/ || \
            cp -ap $(srcdir)/html/Linux-PAM_SAG.html \
                $(srcdir)/html/sag-*.html \
-               $(top_builddir)/Linux-PAM-$(VERSION)-docs/html/
+               $(top_builddir)/Linux-PAM-$(VERSION)/doc/sag/html/
        test -f Linux-PAM_SAG.txt && \
            cp -p Linux-PAM_SAG.txt \
-               $(top_builddir)/Linux-PAM-$(VERSION)-docs/txt/ || \
+               $(top_builddir)/Linux-PAM-$(VERSION)/doc/sag/ || \
            cp -p $(srcdir)/Linux-PAM_SAG.txt \
-               $(top_builddir)/Linux-PAM-$(VERSION)-docs/txt/
+               $(top_builddir)/Linux-PAM-$(VERSION)/doc/sag/
        test -f Linux-PAM_SAG.pdf && \
            cp -p Linux-PAM_SAG.pdf \
-               $(top_builddir)/Linux-PAM-$(VERSION)-docs/pdf/ || \
+               $(top_builddir)/Linux-PAM-$(VERSION)/doc/sag/ || \
            cp -p $(srcdir)/Linux-PAM_SAG.pdf \
-               $(top_builddir)/Linux-PAM-$(VERSION)-docs/pdf/
+               $(top_builddir)/Linux-PAM-$(VERSION)/doc/sag/