summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configure.in7
-rw-r--r--doc/Makefile.am2
-rw-r--r--doc/adg/Makefile.am27
-rw-r--r--doc/mwg/Makefile.am27
-rw-r--r--doc/sag/Makefile.am27
-rw-r--r--doc/specs/Makefile.am4
6 files changed, 41 insertions, 53 deletions
diff --git a/configure.in b/configure.in
index 76ccb131..24b087f6 100644
--- 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 a1155184..3b893899 100644
--- 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 5686e240..03d0c871 100644
--- 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 3d911247..77296189 100644
--- 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 ea8476ee..26b5f5b8 100644
--- 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 440e0076..595c09bf 100644
--- 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 00:30:18 +0000