Relevant BUGIDs: task 15788, bugs 108297, 117476, 117474

Purpose of commit: autoconf support for Linux-PAM

Commit summary:
---------------
This is a merge of the autoconf support that was developed against
a 0-72 branch.

[Note, because CVS has some issues, this is actually only 95% of
 the actual commit. The other files were actually committed when
 the preparation branch Linux-PAM-0-73pre-autoconf was updated.
 Hopefully, this will complete the merge.]

3 files changed, 60 insertions, 73 deletions

diff --git a/doc/Makefile b/doc/Makefile
index 965f24b8..21ae3de2 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,13 +1,13 @@
 
 ### $Id$
 
-TXTER=sgml2txt
-HTMLER=sgml2html
-# older distributions use, sgml2ps
-# newer distributions than the one I use (AGM :^) need the following line:
-#PSER=sgml2latex -o ps
-# until I upgrade this is the default
-PSER=sgml2latex -p
+include ../Make.Rules
+
+# These two should probably be moved into autoconf...
+DOCDIR=/usr/doc/Linux-PAM
+MANDIR=/usr/man
+
+#######################################################
 
 FILES=pam pam_appl pam_modules
 FSRCS=pam.sgml pam_appl.sgml pam_modules.sgml
@@ -29,36 +29,48 @@ all: htmls texts postscript
 htmls: $(HTMLS)
 
 $(HTMLS) : $(FSRCS)
+ifeq ($(HAVE_SGML2HTML),yes)
 	@for i in $(FILES) ; do \
 	if [ ! -f "html/$$i.html" ] || [ "$$i.sgml" -nt "html/$$i.html" ]; \
 	then \
-		cd html ; $(HTMLER) ../$$i ; \
+		cd html ; sgml2html ../$$i ; \
 		if [ $$? -ne 0 ]; then exit 1 ; fi ; \
 		cd .. ; \
 	fi ; \
 	done
+else
+	@echo XXX - you do not have the sgml2html binary installed
+endif
 
 texts: $(TEXTS)
 
 $(TEXTS) : $(FSRCS)
+ifeq ($(HAVE_SGML2TXT),yes)
 	@for i in $(FILES) ; do \
 		if [ ! -f "txts/$$i.txt" ] \
 				|| [ "$$i.sgml" -nt "txts/$$i.txt" ]; then \
-			cd txts ; $(TXTER) ../$$i ; cd .. ; \
+			cd txts ; sgml2txt ../$$i ; cd .. ; \
 		fi ; \
 	done
+else
+	@echo XXX - you do not have the sgml2txt binary installed
+endif
 
 postscript: $(PSFILES)
 
 $(PSFILES): $(FSRCS)
+ifneq ($(PSER),)
 	@for i in $(FILES) ; do \
 	if [ ! -f "ps/$$i.ps" ] || [ "$$i.sgml" -nt "ps/$$i.ps" ]; then \
 		cd ps ; $(PSER) ../$$i ; cd .. ; \
 	fi ; \
 	done
+else
+	@echo XXX - neither sgml2ps nor sgml2latex binaries are installed
+endif
 
-pam.sgml: pam_source.sgml MODULES-SGML
-	@sed -e '/^<!\-\- insert\-file MODULES\-SGML \-\->/r MODULES-SGML' pam_source.sgml > pam.sgml
+pam.sgml: pam_source.sgml MODULES-SGML CREDITS
+	@sed -e '/^<!\-\- insert\-file MODULES\-SGML \-\->/r MODULES-SGML' pam_source.sgml | sed -e '/^<!\-\- insert\-file CREDITS \-\->/r CREDITS' > pam.sgml
 
 MODULES-SGML: $(MODULES)
 	@echo 'Building module text from files in modules/*.sgml'
@@ -70,25 +82,48 @@ MODULES-SGML: $(MODULES)
 
 extraclean: clean
 
-DOCDIR=/usr/doc/Linux-PAM
-MANDIR=/usr/man
+remove:
+	cd man && for file in *.3 ; do \
+	  rm -f $(FAKEROOT)$(MANDIR)/man3/$$file ; \
+	done
+	cd man && for file in *.8 ; do \
+	  rm -f $(FAKEROOT)$(MANDIR)/man8/$$file ; \
+	done
+	cd txts && for file in *.txt; do \
+	  rm -f $(FAKEROOT)$(DOCDIR)/text/$$file ; \
+	done
+	cd ps && for file in *.ps; do \
+	  rm -f $(FAKEROOT)$(DOCDIR)/ps/$$file  ; \
+	done
+	cd html && for file in *.html; do \
+	  rm -f $(FAKEROOT)$(DOCDIR)/html/$$file ; \
+	done
+
 install: all
-	mkdir -p $(FAKEROOT)$(DOCDIR)/{html,ps,text}
+ifeq ($(HAVE_SGML2TXT),yes)
+	mkdir -p $(FAKEROOT)$(DOCDIR)/text
 	for file in txts/*.txt; do \
-	  install -o root -g root -m 644 $$file $(FAKEROOT)$(DOCDIR)/text ; \
+	  install -m 644 $$file $(FAKEROOT)$(DOCDIR)/text ; \
 	done
+endif
+ifneq ($(PSER),)
+	mkdir -p $(FAKEROOT)$(DOCDIR)/ps
 	for file in ps/*.ps; do \
-	  install -o root -g root -m 644 $$file $(FAKEROOT)$(DOCDIR)/ps  ; \
+	  install -m 644 $$file $(FAKEROOT)$(DOCDIR)/ps  ; \
 	done
+endif
+ifeq ($(HAVE_SGML2HTML),yes)
+	mkdir -p $(FAKEROOT)$(DOCDIR)/html
 	for file in html/*.html; do \
-	  install -o root -g root -m 644 $$file $(FAKEROOT)$(DOCDIR)/html ; \
+	  install -m 644 $$file $(FAKEROOT)$(DOCDIR)/html ; \
 	done
+endif
 	mkdir -p $(FAKEROOT)$(MANDIR)/man{3,8}
 	for file in man/*.3 ; do \
-	  install -o root -g root -m 644 $$file $(FAKEROOT)$(MANDIR)/man3 ; \
+	  install -m 644 $$file $(FAKEROOT)$(MANDIR)/man3 ; \
 	done
 	for file in man/*.8 ; do \
-	  install -o root -g root -m 644 $$file $(FAKEROOT)$(MANDIR)/man8 ; \
+	  install -m 644 $$file $(FAKEROOT)$(MANDIR)/man8 ; \
 	done
 
 clean:
@@ -96,6 +131,6 @@ clean:
 	rm -f html/pam*.html
 	rm -f man/*~
 	rm -f $(TEXTS)
-	rm -f $(PSFILES)
+	rm -f $(PSFILES) ps/missfont.log
 	rm -f MODULES-SGML pam.sgml
 
diff --git a/doc/pam_source.sgml b/doc/pam_source.sgml
index 1c369403..346082b0 100644
--- a/doc/pam_source.sgml
+++ b/doc/pam_source.sgml
@@ -45,8 +45,8 @@ DAMAGE.
 <article>
 
 <title>The Linux-PAM System Administrators' Guide
-<author>Andrew G. Morgan, <tt>morgan@linux.kernel.org</tt>
-<date>DRAFT v0.71 1999/11/8
+<author>Andrew G. Morgan, <tt>morgan@kernel.org</tt>
+<date>DRAFT v0.73 2000/11/03
 <abstract>
 This manual documents what a system-administrator needs to know about
 the <bf>Linux-PAM</bf> library. It covers the correct syntax of the
@@ -1046,57 +1046,9 @@ and in such a way that they need not be distributed with Linux-PAM.
 <sect>Author/acknowledgments
 
 <p>
-This document was written by Andrew G. Morgan (morgan@linux.kernel.org)
+This document was written by Andrew G. Morgan (morgan@kernel.org)
 with many contributions from
-<!-- insert credits here -->
-<!--
- an sgml list of people to credit for their contributions to Linux-PAM
- $Id$
-  -->
-Chris Adams,
-Peter Allgeyer,
-Tim Baverstock,
-Tim Berger,
-Craig S. Bell,
-Derrick J. Brashear,
-Ben Buxton,
-Seth Chaiklin,
-Oliver Crow,
-Chris Dent,
-Marc Ewing,
-Cristian Gafton,
-Emmanuel Galanos,
-Brad M. Garcia,
-Eric Hester,
-Roger Hu,
-Eric Jacksch,
-Michael K. Johnson,
-David Kinchlea,
-Olaf Kirch,
-Marcin Korzonek,
-Stephen Langasek,
-Nicolai Langfeldt,
-Elliot Lee,
-Luke Kenneth Casson Leighton,
-Al Longyear,
-Ingo Luetkebohle,
-Marek Michalkiewicz,
-Robert Milkowski,
-Aleph One,
-Martin Pool,
-Sean Reifschneider,
-Jan Rekorajski,
-Erik Troan,
-Theodore Ts'o,
-Jeff Uphoff,
-Myles Uyema,
-Savochkin Andrey Vladimirovich,
-Ronald Wahl,
-David Wood,
-John Wilmes,
-Joseph S. D. Yao
-and
-Alex O.  Yuriev.
+<!-- insert-file CREDITS -->
 
 <p>
 Thanks are also due to Sun Microsystems, especially to Vipin Samar and
diff --git a/doc/ps/.cvsignore b/doc/ps/.cvsignore
index 8d83f2d0..fa1d1137 100644
--- a/doc/ps/.cvsignore
+++ b/doc/ps/.cvsignore
@@ -1 +1 @@
-pam*.ps
\ No newline at end of file
+pam*.ps