From 0c257f3f812a57d111d8ba4d1580c67402f29001 Mon Sep 17 00:00:00 2001 From: thib Date: Thu, 3 Jan 2002 14:18:48 +0000 Subject: [PATCH] added DocBook support --- Makefile.in | 53 ++++++++++++++---------------------------------- configure.in | 32 +++++++++++++++++++++++++++-- script/gen-in.pl | 4 ++-- 3 files changed, 47 insertions(+), 42 deletions(-) diff --git a/Makefile.in b/Makefile.in index f8c3ff8..273c96b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -4,7 +4,7 @@ # @configure_input@ -# $Id: Makefile.in,v 1.79 2001-11-04 18:59:06 thib Exp $ +# $Id: Makefile.in,v 1.80 2002-01-03 14:19:46 thib Exp $ # The following should not be edited manually (use configure options) # If you must do it, BEWARE : some of the following is also defined @@ -66,9 +66,9 @@ HEADERS = $(HEADERSALL) $(SRCDIR)/fcrontab.h $(SRCDIR)/allow.h $(SRCDIR)/filecon HEADERSCONV = $(HEADERSALL) HEADERSSIG = $(HEADERSALL) $(SRCDIR)/allow.h -# this is two regular expressions -RCSNOLOG=.*$.html\|VERSION\|MANIFEST\|configure\|install.sh$ -REXP_MANPAGES=.*[158] +# this is a regular expression : +# do not ci automaticaly generated files and doc (done by doc's Makefile) +RCSNOCI=.*$.html\|VERSION\|MANIFEST\|configure\|install.sh\|doc.*$ all: fcron fcrontab convert-fcrontab files/fcron.conf @@ -98,11 +98,6 @@ install: all if test ! -d $(DESTSBIN); then $(INSTALL) -g $(ROOTGROUP) -o $(ROOTNAME) -m 755 -d $(DESTSBIN) ; fi if test ! -d $(DESTBIN); then $(INSTALL) -g $(ROOTGROUP) -o $(ROOTNAME) -m 755 -d $(DESTBIN) ; fi if test ! -d $(ETC); then $(INSTALL) -g $(ROOTGROUP) -o $(ROOTNAME) -m 755 -d $(ETC) ; fi - if test ! -d $(DESTMAN)/man1; then $(INSTALL) -g $(ROOTGROUP) -o $(ROOTNAME) -m 755 -d $(DESTMAN)/man1 ; fi - if test ! -d $(DESTMAN)/man3; then $(INSTALL) -g $(ROOTGROUP) -o $(ROOTNAME) -m 755 -d $(DESTMAN)/man3 ; fi - if test ! -d $(DESTMAN)/man5; then $(INSTALL) -g $(ROOTGROUP) -o $(ROOTNAME) -m 755 -d $(DESTMAN)/man5 ; fi - if test ! -d $(DESTMAN)/man8; then $(INSTALL) -g $(ROOTGROUP) -o $(ROOTNAME) -m 755 -d $(DESTMAN)/man8 ; fi - if test ! -d $(DESTDOC)/fcron-$(VERSION); then $(INSTALL) -g $(ROOTGROUP) -o $(ROOTNAME) -m 755 -d $(DESTDOC)/fcron-$(VERSION) ; fi # create the spool dir (and change its mode if it already exists) $(INSTALL) -g $(GROUPNAME) -o $(USERNAME) -m 770 -d $(FCRONTABS) @@ -112,13 +107,8 @@ install: all test -f $(ETC)/fcron.allow || test -f $(ETC)/fcron.deny || $(INSTALL) -m 640 -o $(ROOTNAME) -g $(GROUPNAME) $(SRCDIR)/files/fcron.allow $(SRCDIR)/files/fcron.deny $(ETC) test -f $(ETC)/fcron.conf || $(INSTALL) -m 640 -o $(ROOTNAME) -g $(GROUPNAME) $(SRCDIR)/files/fcron.conf $(ETC) test "${USEPAM}" = "0" || $(SRCDIR)/script/install-pam-conf $(SRCDIR) $(ETC) $(ROOTNAME) $(ROOTGROUP) "$(INSTALL)" - $(INSTALL) -m 644 -o $(ROOTNAME) $(SRCDIR)/doc/fcron.8 $(DESTMAN)/man8 - $(INSTALL) -m 644 -o $(ROOTNAME) $(SRCDIR)/doc/fcrontab.1 $(DESTMAN)/man1 - $(INSTALL) -m 644 -o $(ROOTNAME) $(SRCDIR)/doc/fcrontab.5 $(DESTMAN)/man5 - $(INSTALL) -m 644 -o $(ROOTNAME) $(SRCDIR)/doc/fcron.conf.5 $(DESTMAN)/man5 - $(INSTALL) -m 644 -o $(ROOTNAME) $(SRCDIR)/doc/bitstring.3 $(DESTMAN)/man3 - $(INSTALL) -m 644 -o $(ROOTNAME) doc/README doc/LICENSE doc/CHANGES doc/*.html \ - $(DESTDOC)/fcron-$(VERSION)/ + + @(cd doc && make install) # in order to get correct rights when upgrading : find $(FCRONTABS) -type f $ -name "*.orig" -a ! -name "root.orig" $ -exec chown $(USERNAME):$(GROUPNAME) {} \; -exec chmod 640 {} \; @@ -144,12 +134,7 @@ uninstall: rm -f $(DESTSBIN)/fcron rm -f $(DESTBIN)/fcrontab rm -f $(DESTBIN)/fcronsighup - rm -fR $(DESTDOC)/fcron-$(VERSION) - rm -f $(DESTMAN)/man1/fcrontab.1 - rm -f $(DESTMAN)/man3/bitstring.3 - rm -f $(DESTMAN)/man5/fcrontab.5 - rm -f $(DESTMAN)/man5/fcron.conf.5 - rm -f $(DESTMAN)/man8/fcron.8 + @(cd doc && make uninstall) $(SRCDIR)/script/boot-uninstall clean: @@ -159,22 +144,14 @@ clean: vclean: clean find ./ -name "*~" -exec rm -f {} \; rm -f config.log config.status config.h config.cache Makefile + @(cd doc && make clean) files/fcron.conf: files/fcron.conf.in config.h - script/gen-in.pl files/fcron.conf.in files/fcron.conf - -%.html: %.in Makefile config.h - script/gen-in.pl $*.in $* -# groff -Thtml -mandoc $* > ./tmp -# sed "s:: \ -# Generated by groff

$(*F)

:I" < ./tmp > $@ -# rm -f ./tmp - man2html $* | sed "s:$.*$:\1:" > $@ + script/gen-in.pl files/fcron.conf.in files/fcron.conf ./ -updatedoc: doc/* - script/gen-doc $(VERSION) +updatedoc: + @(cd doc && make doc) configure: configure.in # update configure script, then Makefile and config.h, and finally @@ -193,10 +170,10 @@ tar: configure updatedoc vclean echo $(VERSION) > ./VERSION - @(find ./ -type f ! -regex '.*RCS.*' ! -regex "$(RCSNOLOG)" \ - ! -regex "$(REXP_MANPAGES)" -exec ci -l {} \;) -# re-ci the CHANGES file, as we generally update it during the other files' ci - @(ci -l doc/CHANGES) + @(find ./ -type f ! -regex '.*RCS.*' ! -regex "$(RCSNOCI)" \ + -exec ci -l {} \;) +# ci the doc files + @(cd doc && make tar) @(find ./ -type f ! -regex '.*RCS.*' | \ sed -e "s:^\./:fcron-$(VERSION)/:" > MANIFEST) diff --git a/configure.in b/configure.in index 335972b..31bf20b 100644 --- a/configure.in +++ b/configure.in @@ -8,7 +8,7 @@ AC_PREFIX_DEFAULT($prefix) AC_CONFIG_HEADER(config.h) AC_PREREQ(2.7) -vers="2.1.0" +vers="2.1.1" vers_quoted="\"$vers\"" AC_DEFINE_UNQUOTED(VERSION, $vers) AC_DEFINE_UNQUOTED(VERSION_QUOTED, $vers_quoted) @@ -680,6 +680,34 @@ USEPAM="$usepam" AC_SUBST(USEPAM) +dnl DocBook + +AC_PATH_PROG(JADE,openjade) + +if test -z "$JADE"; then + AC_PATH_PROG(JADE,jade) +fi + +DSSSL_DIR="/usr/share/sgml/docbook/dsssl-stylesheets-1.72/" + +AC_MSG_CHECKING(Looking for dsssl stylsheets) +AC_ARG_WITH(dsssl-dir, +[ --with-dsssl-dir=DIR change the default location of DSSSL stylesheets.], +[ case "$withval" in + no) + DSSSL_DIR="" + ;; + yes) + AC_MSG_ERROR(Must be set to DIR or "no".) + ;; + *) + DSSSL_DIR="$withval" + ;; + esac ], +) +AC_SUBST(DSSSL_DIR) + + dnl We set exec_prefix to $prefix (also done in Makefile) exec_prefix=$prefix BINDIREX=`eval echo $bindir` @@ -689,6 +717,6 @@ AC_DEFINE_UNQUOTED(SBINDIREX, "$SBINDIREX") AC_SUBST(BINDIREX) AC_SUBST(SBINDIREX) -AC_OUTPUT(Makefile) +AC_OUTPUT(Makefile doc/Makefile doc/stylesheets/fcron-doc.dsl) diff --git a/script/gen-in.pl b/script/gen-in.pl index 81c8b40..ed73abb 100755 --- a/script/gen-in.pl +++ b/script/gen-in.pl @@ -15,7 +15,7 @@ -open(CONFIG, "./config.h") or print "error while opening config.h\n" and exit; +open(CONFIG, "$ARGV[2]/config.h") or print "error while opening config.h\n" and exit; while ( ) { if ( /^\#define\s+(\w+?)\s+([\w\/-]+?)\s/ ) { @@ -27,7 +27,7 @@ while ( ) { } -open(MAKEFILE, "./Makefile") or print "error while opening Makefile\n" and exit; +open(MAKEFILE, "$ARGV[2]/Makefile") or print "error while opening Makefile\n" and exit; while ( ) { if ( /^\s*?(\w+?)\s*?=\s*?([\w\.\/-]+)\s/ ) { -- 2.40.0