mirror/autoconf
2
0
Fork 0
mirror of git://git.sv.gnu.org/autoconf synced 2025-02-17 14:01:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

1999-10-31 Akim Demaille <akim@epita.fr>

Browse Source 
Create man pages for the executables.

	* Makefile.am (SUBDIRS): Add `man' and prepend `.' so that
	executables be built before help2man is run.
	* configure.in (AC_OUTPUT): Add man/Makefile.
	AC_MSG_ERROR, not AC_ERROR.
	Check for missing help2man.
	* man/Makefile.am: New file.
	* man/autoconf.x: Likewise.
	* man/autoreconf.x: Likewise.
	* man/autoheader.x: Likewise.
	* man/autoscan.x: Likewise.
	* man/autoupdate.x: Likewise.
	* man/ifnames.x: Likewise.
	* man/common.x: Likewise.
This commit is contained in:
Akim Demaille 2000-01-26 12:32:13 +00:00
parent 3c45adf66c
commit 7e58050fc5
17 changed files with 366 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ChangeLog
View File

@ -1,3 +1,21 @@
1999-10-31 Akim Demaille <akim@epita.fr>
Create man pages for the executables.
* Makefile.am (SUBDIRS): Add `man' and prepend `.' so that
executables be built before help2man is run.
* configure.in (AC_OUTPUT): Add man/Makefile.
AC_MSG_ERROR, not AC_ERROR.
Check for missing help2man.
* man/Makefile.am: New file.
* man/autoconf.x: Likewise.
* man/autoreconf.x: Likewise.
* man/autoheader.x: Likewise.
* man/autoscan.x: Likewise.
* man/autoupdate.x: Likewise.
* man/ifnames.x: Likewise.
* man/common.x: Likewise.
1999-10-31 Akim Demaille <akim@epita.fr>
* acgeneral.m4 (AC_INIT_PARSE_ARGS): Reformating of configure and

2
Makefile.am
View File

@ -20,7 +20,7 @@
AUTOMAKE_OPTIONS = check-news 1.4
SUBDIRS = testsuite
SUBDIRS = . man testsuite
MAKEINFO = makeinfo --no-split
TEXI2HTML = texi2html

7
Makefile.in
View File

@ -57,6 +57,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
@SET_MAKE@
AMDEP = @AMDEP@
AMTAR = @AMTAR@
AWK = @AWK@
@ -65,6 +67,7 @@ CPP = @CPP@
CXX = @CXX@
CXXCPP = @CXXCPP@
DEPDIR = @DEPDIR@
HELP2MAN = @HELP2MAN@
M4 = @M4@
PACKAGE = @PACKAGE@
PERL = @PERL@
@ -76,7 +79,7 @@ standards_texi = @standards_texi@
AUTOMAKE_OPTIONS = check-news 1.4
SUBDIRS = testsuite
SUBDIRS = . man testsuite
MAKEINFO = makeinfo --no-split
TEXI2HTML = texi2html
@ -373,8 +376,6 @@ uninstall-pkgdataDATA:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
@SET_MAKE@
all-recursive install-data-recursive install-exec-recursive \
installdirs-recursive install-recursive uninstall-recursive \
check-recursive installcheck-recursive info-recursive dvi-recursive:

10
configure vendored
View File

@ -952,10 +952,12 @@ fi
test -n "$AWK" && break
done
HELP2MAN=${HELP2MAN-"${am_missing_run}help2man"}
# Extract the first word of "perl", so it can be a program name with args.
set dummy perl; ac_word=$2
echo $ac_n "checking for $ac_word... $ac_c" 1>&6
echo "configure:959: checking for $ac_word" 1>&5
echo "configure:961: checking for $ac_word" 1>&5
if test "${ac_cv_path_PERL+set}" = set; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@ -1003,7 +1005,7 @@ fi
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install... $ac_c" 1>&6
echo "configure:1007: checking for a BSD compatible install" 1>&5
echo "configure:1009: checking for a BSD compatible install" 1>&5
if test -z "$INSTALL"; then
if test "${ac_cv_path_install+set}" = set; then
echo $ac_n "(cached) $ac_c" 1>&6
@ -1167,7 +1169,7 @@ cat >$CONFIG_STATUS <<EOF
# Files that config.status was made for.
config_files="\\
acversion.m4 Makefile testsuite/Makefile"
acversion.m4 Makefile man/Makefile testsuite/Makefile"
ac_cs_usage="\\
\\\`$CONFIG_STATUS' instantiates files from templates according to the
@ -1240,6 +1242,7 @@ do
# Handling of arguments.
'acversion.m4' ) CONFIG_FILES="\$CONFIG_FILES acversion.m4" ;;
'Makefile' ) CONFIG_FILES="\$CONFIG_FILES Makefile" ;;
'man/Makefile' ) CONFIG_FILES="\$CONFIG_FILES man/Makefile" ;;
'testsuite/Makefile' ) CONFIG_FILES="\$CONFIG_FILES testsuite/Makefile" ;;
# This is an error.
@ -1324,6 +1327,7 @@ s%@AMDEP@%$AMDEP%;t t
s%@AMDEPBACKSLASH@%$AMDEPBACKSLASH%;t t
s%@DEPDIR@%$DEPDIR%;t t
s%@M4@%$M4%;t t
s%@HELP2MAN@%$HELP2MAN%;t t
s%@PERL@%$PERL%;t t
s%@PERLSCRIPTS@%$PERLSCRIPTS%;t t
s%@standards_texi@%$standards_texi%;t t

9
configure.in
View File

@ -8,13 +8,18 @@ dnl first and get that path embedded in the installed autoconf and
dnl autoheader scripts.
AC_PROG_GNU_M4
if test x"$ac_cv_prog_gnu_m4" != xyes; then
AC_ERROR([GNU m4 is required])
AC_MSG_ERROR([GNU m4 is required])
fi
dnl This is needed because Automake does not seem to realize there is
dnl an AC_SUBST inside AC_PROG_GNU_M4. Grmph!
AC_SUBST(M4)
dnl `autoconf' and `ifnames' use AWK.
AC_PROG_AWK
dnl Generating man pages.
AM_MISSING_PROG(HELP2MAN, help2man)
dnl We use a path for perl so the #! line in autoscan will work.
AC_PATH_PROG(PERL, perl, no)
AC_SUBST(PERL)dnl
@ -33,4 +38,4 @@ if test -f $srcdir/standards.texi; then
fi
AC_SUBST(standards_texi)dnl
AC_OUTPUT(acversion.m4 Makefile testsuite/Makefile)
AC_OUTPUT(acversion.m4 Makefile man/Makefile testsuite/Makefile)

2
doc/Makefile.am
View File

@ -20,7 +20,7 @@
AUTOMAKE_OPTIONS = check-news 1.4
SUBDIRS = testsuite
SUBDIRS = . man testsuite
MAKEINFO = makeinfo --no-split
TEXI2HTML = texi2html

7
doc/Makefile.in
View File

@ -57,6 +57,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
@SET_MAKE@
AMDEP = @AMDEP@
AMTAR = @AMTAR@
AWK = @AWK@
@ -65,6 +67,7 @@ CPP = @CPP@
CXX = @CXX@
CXXCPP = @CXXCPP@
DEPDIR = @DEPDIR@
HELP2MAN = @HELP2MAN@
M4 = @M4@
PACKAGE = @PACKAGE@
PERL = @PERL@
@ -76,7 +79,7 @@ standards_texi = @standards_texi@
AUTOMAKE_OPTIONS = check-news 1.4
SUBDIRS = testsuite
SUBDIRS = . man testsuite
MAKEINFO = makeinfo --no-split
TEXI2HTML = texi2html
@ -373,8 +376,6 @@ uninstall-pkgdataDATA:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
@SET_MAKE@
all-recursive install-data-recursive install-exec-recursive \
installdirs-recursive install-recursive uninstall-recursive \
check-recursive installcheck-recursive info-recursive dvi-recursive:

33
man/Makefile.am Normal file
View File

@ -0,0 +1,33 @@
## Process this file with automake to produce Makefile.in -*-Makefile-*-
man_MANS = autoconf.1 autoreconf.1 autoheader.1 autoupdate.1 ifnames.1 \
autoscan.1
man_aux = autoconf.x autoreconf.x autoheader.x autoupdate.x ifnames.x \
autoscan.x
EXTRA_DIST = $(man_MANS) $(man_aux) common.x
MAINTAINERCLEANFILES = $(man_MANS)
# Depend on configure.in to get version number changes.
$(man_MANS): $(top_srcdir)/configure.in $(srcdir)/common.x
autoconf.1: $(srcdir)/autoconf.x $(top_srcdir)/autoconf.sh
autoreconf.1: $(srcdir)/autoreconf.x $(top_srcdir)/autoreconf.sh
autoheader.1: $(srcdir)/autoheader.x $(top_srcdir)/autoheader.sh
autoupdate.1: $(srcdir)/autoupdate.x $(top_srcdir)/autoupdate.sh
ifnames.1: $(srcdir)/ifnames.x $(top_srcdir)/ifnames.sh
autoscan.1: $(srcdir)/autoscan.x $(top_srcdir)/autoscan.pl
SUFFIXES = .x .1
.x.1:
@if test -f $(top_builddir)/$*; then \
echo "Updating man page $@"; \
$(HELP2MAN) \
--include=$(srcdir)/$*.x \
--include=$(srcdir)/common.x \
--output=$@ \
$(top_builddir)/$*; \
else \
echo "WARNING: The man page $@ cannot be updated yet."; \
echo " Retry once the corresponding executable is built."; \
fi

266
man/Makefile.in Normal file
View File

@ -0,0 +1,266 @@
# Makefile.in generated automatically by automake 1.4a from Makefile.am
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
SHELL = @SHELL@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
sbindir = @sbindir@
libexecdir = @libexecdir@
datadir = @datadir@
sysconfdir = @sysconfdir@
sharedstatedir = @sharedstatedir@
localstatedir = @localstatedir@
libdir = @libdir@
infodir = @infodir@
mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include
DESTDIR =
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ..
ACLOCAL = @ACLOCAL@
AUTOCONF = @AUTOCONF@
AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_FLAG =
transform = @program_transform_name@
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
AMDEP = @AMDEP@
AMTAR = @AMTAR@
AWK = @AWK@
CC = @CC@
CPP = @CPP@
CXX = @CXX@
CXXCPP = @CXXCPP@
DEPDIR = @DEPDIR@
HELP2MAN = @HELP2MAN@
M4 = @M4@
MAKEINFO = @MAKEINFO@
PACKAGE = @PACKAGE@
PERL = @PERL@
PERLSCRIPTS = @PERLSCRIPTS@
VERSION = @VERSION@
install_sh = @install_sh@
standards_texi = @standards_texi@
man_MANS = autoconf.1 autoreconf.1 autoheader.1 autoupdate.1 ifnames.1 \
autoscan.1
man_aux = autoconf.x autoreconf.x autoheader.x autoupdate.x ifnames.x \
autoscan.x
EXTRA_DIST = $(man_MANS) $(man_aux) common.x
MAINTAINERCLEANFILES = $(man_MANS)
SUFFIXES = .x .1
subdir = man
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_CLEAN_FILES =
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
DIST_SOURCES =
man1dir = $(mandir)/man1
MANS = $(man_MANS)
NROFF = nroff
DIST_COMMON = Makefile.am Makefile.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
GZIP_ENV = --best
all: all-redirect
.SUFFIXES:
.SUFFIXES: .1 .x
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
install-man1:
$(mkinstalldirs) $(DESTDIR)$(man1dir)
@list='$(man1_MANS)'; \
l2='$(man_MANS)'; for i in $$l2; do \
case "$$i" in \
*.1*) list="$$list $$i" ;; \
esac; \
done; \
for i in $$list; do \
if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
else file=$$i; fi; \
ext=`echo $$i | sed -e 's/^.*\\.//'`; \
inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
inst=`echo $$inst | sed -e 's/^.*\///'`; \
inst=`echo $$inst | sed '$(transform)'`.$$ext; \
echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
$(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
done
uninstall-man1:
@list='$(man1_MANS)'; \
l2='$(man_MANS)'; for i in $$l2; do \
case "$$i" in \
*.1*) list="$$list $$i" ;; \
esac; \
done; \
for i in $$list; do \
ext=`echo $$i | sed -e 's/^.*\\.//'`; \
inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
inst=`echo $$inst | sed -e 's/^.*\///'`; \
inst=`echo $$inst | sed '$(transform)'`.$$ext; \
echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
rm -f $(DESTDIR)$(man1dir)/$$inst; \
done
install-man: $(MANS)
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-man1
uninstall-man:
@$(NORMAL_UNINSTALL)
$(MAKE) $(AM_MAKEFLAGS) uninstall-man1
tags: TAGS
TAGS:
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
distdir: $(DISTFILES)
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
cp -pR $$d/$$file $(distdir); \
else \
test -f $(distdir)/$$file \
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
|| cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
info-am:
info: info-am
dvi-am:
dvi: dvi-am
check-am: all-am
check: check-am
installcheck-am:
installcheck: installcheck-am
install-exec-am:
install-exec: install-exec-am
install-data-am: install-man
install-data: install-data-am
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
install: install-am
uninstall-am: uninstall-man
uninstall: uninstall-am
all-am: Makefile $(MANS)
all-redirect: all-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
installdirs:
$(mkinstalldirs) $(DESTDIR)$(mandir)/man1
mostlyclean-generic:
clean-generic:
distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES)
-rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
-rm -f Makefile.in
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
mostlyclean-am: mostlyclean-generic
mostlyclean: mostlyclean-am
clean-am: clean-generic mostlyclean-am
clean: clean-am
distclean-am: distclean-generic clean-am
distclean: distclean-am
maintainer-clean-am: maintainer-clean-generic distclean-am
@echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild."
maintainer-clean: maintainer-clean-am
.PHONY: install-man1 uninstall-man1 install-man uninstall-man tags \
distdir info-am info dvi-am dvi check check-am installcheck-am \
installcheck install-exec-am install-exec install-data-am install-data \
install-am install uninstall-am uninstall all-redirect all-am all \
install-strip installdirs mostlyclean-generic distclean-generic \
clean-generic maintainer-clean-generic clean mostlyclean distclean \
maintainer-clean
# Depend on configure.in to get version number changes.
$(man_MANS): $(top_srcdir)/configure.in $(srcdir)/common.x
autoconf.1: $(srcdir)/autoconf.x $(top_srcdir)/autoconf.sh
autoreconf.1: $(srcdir)/autoreconf.x $(top_srcdir)/autoreconf.sh
autoheader.1: $(srcdir)/autoheader.x $(top_srcdir)/autoheader.sh
autoupdate.1: $(srcdir)/autoupdate.x $(top_srcdir)/autoupdate.sh
ifnames.1: $(srcdir)/ifnames.x $(top_srcdir)/ifnames.sh
autoscan.1: $(srcdir)/autoscan.x $(top_srcdir)/autoscan.pl
.x.1:
@if test -f $(top_builddir)/$*; then \
echo "Updating man page $@"; \
$(HELP2MAN) \
--include=$(srcdir)/$*.x \
--include=$(srcdir)/common.x \
--output=$@ \
$(top_builddir)/$*; \
else \
echo "WARNING: The man page $@ cannot be updated yet."; \
echo " Retry once the corresponding executable is built."; \
fi
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

3
man/autoconf.x Normal file
View File

@ -0,0 +1,3 @@
[name]
autoconf \- Generate configuration scripts

3
man/autoheader.x Normal file
View File

@ -0,0 +1,3 @@
[name]
autoheader \- Create a template header for configure

2
man/autoreconf.x Normal file
View File

@ -0,0 +1,2 @@
[name]
autoreconf \- Update generated configuration files

3
man/autoscan.x Normal file
View File

@ -0,0 +1,3 @@
[name]
autoscan \- Generate a preliminary configure.in

3
man/autoupdate.x Normal file
View File

@ -0,0 +1,3 @@
[name]
autoupdate \- Update a configure.in to a newer Autoconf

7
man/common.x Normal file
View File

@ -0,0 +1,7 @@
[see also]
.BR autoconf (1),
.BR autoreconf (1),
.BR autoupdate (1),
.BR autoheader (1),
.BR autoscan (1),
.BR ifnames (1).

3
man/ifnames.x Normal file
View File

@ -0,0 +1,3 @@
[name]
ifnames \- Extract CPP conditionals from a set of files

1
testsuite/Makefile.in
View File

@ -64,6 +64,7 @@ CPP = @CPP@
CXX = @CXX@
CXXCPP = @CXXCPP@
DEPDIR = @DEPDIR@
HELP2MAN = @HELP2MAN@
M4 = @M4@
MAKEINFO = @MAKEINFO@
PACKAGE = @PACKAGE@