Relevant BUGIDs:

Purpose of commit: cleanup

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

2006-11-28  Thorsten Kukuk  <kukuk@thkukuk.de>

        * configure.in: Remove --enable-docdir (obsolete by --docdir).
        * doc/Makefile.am: Don't overwrite htmldir.
        * doc/adg/Makefile.am: Use docdir, htmldir and pdfdir.
        * doc/mwg/Makefile.am: Likewise.
        * doc/sag/Makefile.am: Likewise.
        * doc/specs/Makefile.am: Use docdir.

diff --git a/configure.in b/configure.in
index 76ccb131c2906e4cd228c1dce4b9930ee80af631..24b087f6a9b806d4e0820d6415ef545a78deab07 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(conf/pam_conv1/pam_conv_y.y)
 AM_INIT_AUTOMAKE("Linux-PAM", 0.99.6.3)
+AC_PREREQ([2.60])
 AM_CONFIG_HEADER(config.h)
 AC_CANONICAL_HOST
 
@@ -240,12 +241,6 @@ AC_ARG_ENABLE(sconfigdir,
        SCONFIGDIR=$enableval, SCONFIGDIR=$sysconfdir/security)
 AC_SUBST(SCONFIGDIR)
 
-AC_ARG_ENABLE(docdir,
-       AC_HELP_STRING([--enable-docdir=DIR],[path to documentation @<:@default=$datadir/doc/pam@:>@]),
-       DOCDIR=$enableval, DOCDIR=$datadir/doc/pam)
-AC_SUBST(DOCDIR)
-
-
 AC_ARG_ENABLE(pamlocking,
        AC_HELP_STRING([--enable-pamlocking],[configure libpam to observe a global authentication lock]),
        WITH_PAMLOCKING=yes ; AC_DEFINE([PAM_LOCKING],,

diff --git a/doc/Makefile.am b/doc/Makefile.am
index a11551849a2be0e3d2f645943c1bb8ee76032c98..3b89389957e78d8de4b53fc03b78e005559aedf8 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -6,8 +6,6 @@ SUBDIRS = man specs sag adg mwg
 
 CLEANFILES = *~
 
-htmldir = $(DOCDIR)/html
-
 dist_html_DATA = index.html
 
 #######################################################

diff --git a/doc/adg/Makefile.am b/doc/adg/Makefile.am
index 5686e240f05e683e21a373f938bc9f1c035f8733..03d0c871c325c55525a9092de96c217a8008c93d 100644 (file)
--- a/doc/adg/Makefile.am
+++ b/doc/adg/Makefile.am
@@ -53,30 +53,29 @@ distclean-local:
 endif
 
 install-data-local:
-       $(mkinstalldirs) $(DESTDIR)$(DOCDIR)
-       $(mkinstalldirs) $(DESTDIR)$(DOCDIR)/txt
-       $(mkinstalldirs) $(DESTDIR)$(DOCDIR)/pdf
-       $(mkinstalldirs) $(DESTDIR)$(DOCDIR)/html
+       $(mkinstalldirs) $(DESTDIR)$(docdir)
+       $(mkinstalldirs) $(DESTDIR)$(pdfdir)
+       $(mkinstalldirs) $(DESTDIR)$(htmldir)
        test -f html/Linux-PAM_ADG.html || exit 0; \
            $(install_sh_DATA) html/Linux-PAM_ADG.html html/adg-*.html \
-               $(DESTDIR)$(DOCDIR)/html/ || \
+               $(DESTDIR)$(htmldir)/ || \
            $(install_sh_DATA) $(srcdir)/html/Linux-PAM_ADG.html \
                $(srcdir)/html/sag-*.html \
-               $(DESTDIR)$(DOCDIR)/html/
+               $(DESTDIR)$(htmldir)/
        test -f Linux-PAM_ADG.txt || exit 0; \
-           $(install_sh_DATA) Linux-PAM_ADG.txt $(DESTDIR)$(DOCDIR)/txt/ || \
+           $(install_sh_DATA) Linux-PAM_ADG.txt $(DESTDIR)$(docdir)/ || \
            $(install_sh_DATA) $(srcdir)/Linux-PAM_ADG.txt \
-               $(DESTDIR)$(DOCDIR)/txt/
+               $(DESTDIR)$(docdir)/
        test -f Linux-PAM_ADG.pdf || exit 0; \
-           $(install_sh_DATA) Linux-PAM_ADG.pdf $(DESTDIR)$(DOCDIR)/pdf/ || \
+           $(install_sh_DATA) Linux-PAM_ADG.pdf $(DESTDIR)$(pdfdir)/ || \
            $(install_sh_DATA) $(srcdir)/Linux-PAM_ADG.pdf \
-               $(DESTDIR)$(DOCDIR)/pdf/
+               $(DESTDIR)$(pdfdir)/
 
 uninstall-local:
-       -rm $(DESTDIR)$(DOCDIR)/html/Linux-PAM_ADG.html
-       -rm $(DESTDIR)$(DOCDIR)/html/adg-*.html
-       -rm $(DESTDIR)$(DOCDIR)/txt/Linux-PAM_ADG.txt
-       -rm $(DESTDIR)$(DOCDIR)/pdf/Linux-PAM_ADG.pdf
+       -rm $(DESTDIR)$(htmldir)/Linux-PAM_ADG.html
+       -rm $(DESTDIR)$(htmldir)/adg-*.html
+       -rm $(DESTDIR)$(docdir)/Linux-PAM_ADG.txt
+       -rm $(DESTDIR)$(pdfdir)/Linux-PAM_ADG.pdf
 
 releasedocs: all
        $(mkinstalldirs) $(top_builddir)/Linux-PAM-$(VERSION)/doc/adg/html

diff --git a/doc/mwg/Makefile.am b/doc/mwg/Makefile.am
index 3d911247019d73d7251b9de6df2e84173904ab14..77296189651b00fe29ac9297db1d49c4dc73806a 100644 (file)
--- a/doc/mwg/Makefile.am
+++ b/doc/mwg/Makefile.am
@@ -53,30 +53,29 @@ distclean-local:
 endif
 
 install-data-local:
-       $(mkinstalldirs) $(DESTDIR)$(DOCDIR)
-       $(mkinstalldirs) $(DESTDIR)$(DOCDIR)/txt
-       $(mkinstalldirs) $(DESTDIR)$(DOCDIR)/pdf
-       $(mkinstalldirs) $(DESTDIR)$(DOCDIR)/html
+       $(mkinstalldirs) $(DESTDIR)$(docdir)
+       $(mkinstalldirs) $(DESTDIR)$(pdfdir)
+       $(mkinstalldirs) $(DESTDIR)$(htmldir)
        test -f html/Linux-PAM_MWG.html || exit 0; \
            $(install_sh_DATA) html/Linux-PAM_MWG.html html/mwg-*.html \
-               $(DESTDIR)$(DOCDIR)/html/ || \
+               $(DESTDIR)$(htmldir)/ || \
            $(install_sh_DATA) $(srcdir)/html/Linux-PAM_MWG.html \
                $(srcdir)/html/sag-*.html \
-               $(DESTDIR)$(DOCDIR)/html/
+               $(DESTDIR)$(htmldir)/
        test -f Linux-PAM_MWG.txt || exit 0; \
-           $(install_sh_DATA) Linux-PAM_MWG.txt $(DESTDIR)$(DOCDIR)/txt/ || \
+           $(install_sh_DATA) Linux-PAM_MWG.txt $(DESTDIR)$(docdir)/ || \
            $(install_sh_DATA) $(srcdir)/Linux-PAM_MWG.txt \
-               $(DESTDIR)$(DOCDIR)/txt/
+               $(DESTDIR)$(docdir)/
        test -f Linux-PAM_MWG.pdf || exit 0; \
-           $(install_sh_DATA) Linux-PAM_MWG.pdf $(DESTDIR)$(DOCDIR)/pdf/ || \
+           $(install_sh_DATA) Linux-PAM_MWG.pdf $(DESTDIR)$(pdfdir)/ || \
            $(install_sh_DATA) $(srcdir)/Linux-PAM_MWG.pdf \
-               $(DESTDIR)$(DOCDIR)/pdf/
+               $(DESTDIR)$(pdfdir)/
 
 uninstall-local:
-       -rm $(DESTDIR)$(DOCDIR)/html/Linux-PAM_MWG.html
-       -rm $(DESTDIR)$(DOCDIR)/html/mwg-*.html
-       -rm $(DESTDIR)$(DOCDIR)/txt/Linux-PAM_MWG.txt
-       -rm $(DESTDIR)$(DOCDIR)/pdf/Linux-PAM_MWG.pdf
+       -rm $(DESTDIR)$(htmldir)/Linux-PAM_MWG.html
+       -rm $(DESTDIR)$(htmldir)/mwg-*.html
+       -rm $(DESTDIR)$(docdir)/Linux-PAM_MWG.txt
+       -rm $(DESTDIR)$(pdfdir)/Linux-PAM_MWG.pdf
 
 releasedocs: all
        $(mkinstalldirs) $(top_builddir)/Linux-PAM-$(VERSION)/doc/mwg/html

diff --git a/doc/sag/Makefile.am b/doc/sag/Makefile.am
index ea8476ee54aad2724c70bce78549ea07c4e9c8da..26b5f5b86c3eaccbc4fed895aeb1465ec603b25e 100644 (file)
--- a/doc/sag/Makefile.am
+++ b/doc/sag/Makefile.am
@@ -53,30 +53,29 @@ distclean-local:
 endif
 
 install-data-local:
-       $(mkinstalldirs) $(DESTDIR)$(DOCDIR)
-       $(mkinstalldirs) $(DESTDIR)$(DOCDIR)/txt
-       $(mkinstalldirs) $(DESTDIR)$(DOCDIR)/pdf
-       $(mkinstalldirs) $(DESTDIR)$(DOCDIR)/html
+       $(mkinstalldirs) $(DESTDIR)$(docdir)
+       $(mkinstalldirs) $(DESTDIR)$(pdfdir)
+       $(mkinstalldirs) $(DESTDIR)$(htmldir)
        test -f html/Linux-PAM_SAG.html || exit 0; \
            $(install_sh_DATA) html/Linux-PAM_SAG.html html/sag-*.html \
-               $(DESTDIR)$(DOCDIR)/html/ || \
+               $(DESTDIR)$(htmldir)/ || \
            $(install_sh_DATA) $(srcdir)/html/Linux-PAM_SAG.html \
                $(srcdir)/html/sag-*.html \
-               $(DESTDIR)$(DOCDIR)/html/
+               $(DESTDIR)$(htmldir)/
        test -f Linux-PAM_SAG.txt || exit 0; \
-           $(install_sh_DATA) Linux-PAM_SAG.txt $(DESTDIR)$(DOCDIR)/txt/ || \
+           $(install_sh_DATA) Linux-PAM_SAG.txt $(DESTDIR)$(docdir)/ || \
            $(install_sh_DATA) $(srcdir)/Linux-PAM_SAG.txt \
-               $(DESTDIR)$(DOCDIR)/txt/
+               $(DESTDIR)$(docdir)/
        test -f Linux-PAM_SAG.pdf || exit 0; \
-           $(install_sh_DATA) Linux-PAM_SAG.pdf $(DESTDIR)$(DOCDIR)/pdf/ || \
+           $(install_sh_DATA) Linux-PAM_SAG.pdf $(DESTDIR)$(pdfdir)/ || \
            $(install_sh_DATA) $(srcdir)/Linux-PAM_SAG.pdf \
-               $(DESTDIR)$(DOCDIR)/pdf/
+               $(DESTDIR)$(pdfdir)/
 
 uninstall-local:
-       -rm $(DESTDIR)$(DOCDIR)/html/Linux-PAM_SAG.html
-       -rm $(DESTDIR)$(DOCDIR)/html/sag-*.html
-       -rm $(DESTDIR)$(DOCDIR)/txt/Linux-PAM_SAG.txt
-       -rm $(DESTDIR)$(DOCDIR)/pdf/Linux-PAM_SAG.pdf
+       -rm $(DESTDIR)$(htmldir)/Linux-PAM_SAG.html
+       -rm $(DESTDIR)$(htmldir)/sag-*.html
+       -rm $(DESTDIR)$(docdir)/Linux-PAM_SAG.txt
+       -rm $(DESTDIR)$(pdfdir)/Linux-PAM_SAG.pdf
 
 releasedocs: all
        $(mkinstalldirs) $(top_builddir)/Linux-PAM-$(VERSION)/doc/sag/html

diff --git a/doc/specs/Makefile.am b/doc/specs/Makefile.am
index 440e0076499f850a98724cd9b13a3732a3ede4df..595c09bf142b919d25cf37362fef6179ccc2b95e 100644 (file)
--- a/doc/specs/Makefile.am
+++ b/doc/specs/Makefile.am
@@ -19,6 +19,4 @@ padout_SOURCES = parse_l.l parse_y.y
 
 padout_LDADD = @LEXLIB@
 
-specdir = $(DOCDIR)/spec
-
-spec_DATA = draft-morgan-pam-current.txt rfc86.0.txt
+doc_DATA = draft-morgan-pam-current.txt rfc86.0.txt