From 279cf1e958f60b55618e6b7be33c8b900bcc52aa Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Sun, 21 Feb 2010 13:37:52 -0500 Subject: [PATCH] Add doc Makefile.in and wire it up --- Makefile | 4 +- configure | 3 +- configure.in | 2 +- doc/Makefile.in | 149 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 154 insertions(+), 4 deletions(-) create mode 100644 doc/Makefile.in diff --git a/Makefile b/Makefile index 6e9df1389..44a49a7df 100644 --- a/Makefile +++ b/Makefile @@ -15,8 +15,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# XXX - add sudoers, doc, compat -SUBDIRS = src plugins/sample +# XXX - add plugins/sudoers, compat +SUBDIRS = src plugins/sample doc all clean install: @if [ ! -s config.status ]; then \ diff --git a/configure b/configure index b65c28e07..7bfcc9ff1 100755 --- a/configure +++ b/configure @@ -26207,7 +26207,7 @@ EOF exec_prefix="$oexec_prefix" fi -ac_config_files="$ac_config_files src/sudo_usage.h src/Makefile plugins/sample/Makefile" +ac_config_files="$ac_config_files doc/Makefile.in src/sudo_usage.h src/Makefile plugins/sample/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -26763,6 +26763,7 @@ do case $ac_config_target in "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; "pathnames.h") CONFIG_HEADERS="$CONFIG_HEADERS pathnames.h" ;; + "doc/Makefile.in") CONFIG_FILES="$CONFIG_FILES doc/Makefile.in" ;; "src/sudo_usage.h") CONFIG_FILES="$CONFIG_FILES src/sudo_usage.h" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "plugins/sample/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/sample/Makefile" ;; diff --git a/configure.in b/configure.in index 9734e19b1..c71b7b24a 100644 --- a/configure.in +++ b/configure.in @@ -2718,7 +2718,7 @@ dnl dnl Substitute into the Makefile and man pages dnl dnl AC_CONFIG_FILES([doc/sudo.man doc/visudo.man doc/sudoers.man doc/sudoers.ldap.man doc/sudoreplay.man src/Makefile src/sudo_usage.h]) -AC_CONFIG_FILES([src/sudo_usage.h src/Makefile plugins/sample/Makefile]) +AC_CONFIG_FILES([doc/Makefile.in src/sudo_usage.h src/Makefile plugins/sample/Makefile]) AC_OUTPUT dnl diff --git a/doc/Makefile.in b/doc/Makefile.in new file mode 100644 index 000000000..733fb6c78 --- /dev/null +++ b/doc/Makefile.in @@ -0,0 +1,149 @@ +# +# Copyright (c) 2010 Todd C. Miller +# +# Permission to use, copy, modify, and distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# @configure_input@ +# + +#### Start of system configuration section. #### + +srcdir = @srcdir@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + +# Tools to use +NROFF = nroff -Tascii + +# Our install program supports extra flags... +INSTALL = $(SHELL) $(top_srcdir)/install-sh -c + +# Where to install things... +prefix = @prefix@ +datarootdir = @datarootdir@ +mandir = @mandir@ + +# Directory in which to install the man page +mantype = @MANTYPE@ +mansectsu = @mansectsu@ +mansectform = @mansectform@ +mandirsu = $(mandir)/$(mantype)$(mansectsu) +mandirform = $(mandir)/$(mantype)$(mansectform) + +# User and group ids the installed files should be "owned" by +install_uid = 0 +install_gid = 0 + +#### End of system configuration section. #### + +SHELL = /bin/sh + +DOCS = sudo.man visudo.man sudoers.man sudoers.ldap.man sudoers.man \ + sudoreplay.man + +VERSION = @PACKAGE_VERSION@ + +# XXX - add DEV dependencies to build .man.in and .cat files +all: $(DOCS) + +.SUFFIXES: .man .cat + +.man.cat: + @rm -f $@ + sed '1s/^/.if n .ll 78n/' $< | $(NROFF) -man > $@ + +sudo.man.in: $(srcdir)/sudo.pod + @rm -f $(srcdir)/$@ + ( cd $(srcdir); mansectsu=`echo @MANSECTSU@|tr A-Z a-z`; mansectform=`echo @MANSECTFORM@|tr A-Z a-z`; sed -n -e '/^=pod/q' -e 's/^/.\\" /p' sudo.pod > $@; pod2man --quotes=none --date="`date '+%B %e, %Y'`" --section=$$mansectsu --release=$(VERSION) --center="MAINTENANCE COMMANDS" sudo.pod | sed -e "s/(5)/($$mansectform)/" -e "s/(8)/($$mansectsu)/" | perl -p sudo.man.pl >> $@ ) + +sudo.man: sudo.man.in + CONFIG_FILES=$@ CONFIG_HEADERS= sh $(top_builddir)/config.status + +sudo.cat: sudo.man + +visudo.man.in: $(srcdir)/visudo.pod + @rm -f $(srcdir)/$@ + ( cd $(srcdir); mansectsu=`echo @MANSECTSU@|tr A-Z a-z`; mansectform=`echo @MANSECTFORM@|tr A-Z a-z`; sed -n -e '/^=pod/q' -e 's/^/.\\" /p' visudo.pod > $@; pod2man --quotes=none --date="`date '+%B %e, %Y'`" --section=$$mansectsu --release=$(VERSION) --center="MAINTENANCE COMMANDS" visudo.pod | sed -e "s/(5)/($$mansectform)/" -e "s/(8)/($$mansectsu)/" -e 's|\\fI\\f\((CW*\)*I@\([^@]*\)\\fI@|\\fI@\2@|g' >> $@ ) + +visudo.man: visudo.man.in + CONFIG_FILES=$@ CONFIG_HEADERS= sh $(top_builddir)/config.status + +visudo.cat: visudo.man + +sudoers.man.in: $(srcdir)/sudoers.pod + @rm -f $(srcdir)/$@ + ( cd $(srcdir); mansectsu=`echo @MANSECTSU@|tr A-Z a-z`; mansectform=`echo @MANSECTFORM@|tr A-Z a-z`; sed -n -e '/^=pod/q' -e 's/^/.\\" /p' sudoers.pod > $@; pod2man --quotes=none --date="`date '+%B %e, %Y'`" --section=$$mansectform --release=$(VERSION) --center="MAINTENANCE COMMANDS" sudoers.pod | sed -e "s/(5)/($$mansectform)/" -e "s/(8)/($$mansectsu)/" | perl -p sudoers.man.pl >> $@ ) + +sudoers.man:: sudoers.man.in + CONFIG_FILES=$@ CONFIG_HEADERS= sh $(top_builddir)/config.status + +sudoers.cat: sudoers.man + +sudoers.ldap.man.in: $(srcdir)/sudoers.ldap.pod + @rm -f $(srcdir)/$@ + ( cd $(srcdir); mansectsu=`echo @MANSECTSU@|tr A-Z a-z`; mansectform=`echo @MANSECTFORM@|tr A-Z a-z`; sed -n -e '/^=pod/q' -e 's/^/.\\" /p' sudoers.ldap.pod > $@; pod2man --quotes=none --date="`date '+%B %e, %Y'`" --section=$$mansectform --release=$(VERSION) --center="MAINTENANCE COMMANDS" sudoers.ldap.pod | sed -e "s/(5)/($$mansectform)/" -e "s/(8)/($$mansectsu)/" -e 's|\\fI\\f\((CW*\)*I@\([^@]*\)\\fI@|\\fI@\2@|g' >> $@ ) + +sudoers.ldap.man:: sudoers.ldap.man.in + CONFIG_FILES=$@ CONFIG_HEADERS= sh $(top_builddir)/config.status + +sudoers.ldap.cat: sudoers.ldap.man + +sudoreplay.man.in: $(srcdir)/sudoreplay.pod + @rm -f $(srcdir)/$@ + ( cd $(srcdir); mansectsu=`echo @MANSECTSU@|tr A-Z a-z`; mansectform=`echo @MANSECTFORM@|tr A-Z a-z`; sed -n -e '/^=pod/q' -e 's/^/.\\" /p' sudoreplay.pod > $@; pod2man --quotes=none --date="`date '+%B %e, %Y'`" --section=$$mansectsu --release=$(VERSION) --center="MAINTENANCE COMMANDS" sudoreplay.pod | sed -e "s/(5)/($$mansectform)/" -e "s/(8)/($$mansectsu)/" -e 's|\\fI\\f\((CW*\)*I@\([^@]*\)\\fI@|\\fI@\2@|g' >> $@ ) + +sudoreplay.man:: sudoreplay.man.in + CONFIG_FILES=$@ CONFIG_HEADERS= sh $(top_builddir)/config.status + +sudoers.cat: sudoers.man + +@DEV@HISTORY: history.pod +@DEV@ pod2text -l -i0 $> > $@ +@DEV@ +@DEV@LICENSE: license.pod +@DEV@ pod2text -l -i0 $> | sed '1,2d' > $@ + +install: install-dirs install-man + +install-dirs: + $(SHELL) $(top_srcdir)/mkinstalldirs \ + $(DESTDIR)$(mandirsu) $(DESTDIR)$(mandirform) \ + +install-binaries: + +install-man: install-dirs + $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 @mansrcdir@/sudo.$(mantype) $(DESTDIR)$(mandirsu)/sudo.$(mansectsu) + @rm -f $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu) + ln $(DESTDIR)$(mandirsu)/sudo.$(mansectsu) $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu) + @REPLAY@$(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 @mansrcdir@/sudoreplay.$(mantype) $(DESTDIR)$(mandirsu)/sudoreplay.$(mansectsu) + $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 @mansrcdir@/visudo.$(mantype) $(DESTDIR)$(mandirsu)/visudo.$(mansectsu) + $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 @mansrcdir@/sudoers.$(mantype) $(DESTDIR)$(mandirform)/sudoers.$(mansectform) + @LDAP@$(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 @mansrcdir@/sudoers.ldap.$(mantype) $(DESTDIR)$(mandirform)/sudoers.ldap.$(mansectform) +@MAN_POSTINSTALL@ + +check: + @echo nothing to check + +clean: + +mostlyclean: clean + +distclean: clean + -rm -rf *.man + +clobber: distclean + +realclean: distclean + +cleandir: distclean -- 2.40.0