+2004-12-30 Alexandre Duret-Lutz <adl@gnu.org>
+
+ Support for `install-dvi', `install-html', `install-ps', and
+ `install-pdf', as recently introduced into the GNU Coding
+ Standard.
+
+ * automake.in (handle_factored_dependencies): Reject
+ uninstall-dvi-local, uninstall-html-local, uninstall-info-local,
+ uninstall-ps-local, and uninstall-pdf-local. Allow
+ install-info-local even when no-installinfo is not used.
+ (handle_data): Allow datarootdir, dvidir, htmldir, pdfdir, and psdir.
+ (%standard_prefix): Declare these new standard directory variables.
+ * doc/automake.texi (Texinfo, Third-Party Makefiles): Document
+ install-dvi, install-html, install-pdf, and install-ps.
+ (Extending): Document install-local-dvi, install-local-html,
+ install-local-info, install-local-pdf, and install-local-ps.
+ * lib/Automake/Rule.pm (%dependencies): Add new install rules,
+ and remove uninstall-info.
+ * /cvs/automake/automake/lib/am/texinfos.am (install-dvi,
+ install-dvi-am, install-dvi-recursive, install-html,
+ install-html-am, install-html-recursive, install-pdf,
+ install-pdf-am, install-pdf-recursive, install-ps, install-ps-am,
+ install-ps-recursive, uninstall-dvi-am, uninstall-html-am,
+ uninstall-pdf-am, uninstall-ps-am): New rules.
+ (uninstall-info): Delete.
+ * tests/txinfo21.test: Augment to check for these new rules.
+ * tests/exdir2.test: Do not use `htmldir' as example of
+ undefined directory.
+ * tests/overrid.test: Do not be fooled by install-ps and
+ install-html.
+ * tests/txinfo10.test: Do not grep for uninstall-info-recursive.
+
2004-12-27 Alexandre Duret-Lutz <adl@gnu.org>
* automake.in (Preprocessed Fortran): Fix the definition of FCLINK.
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
- install-exec-recursive install-info-recursive \
- install-recursive installcheck-recursive installdirs-recursive \
- pdf-recursive ps-recursive uninstall-info-recursive \
- uninstall-recursive
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
ETAGS = etags
echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
rm -f "$(DESTDIR)$(bindir)/$$f"; \
done
-uninstall-info-am:
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
install-data-am:
+install-dvi: install-dvi-recursive
+
install-exec-am: install-binSCRIPTS
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+install-html: install-html-recursive
+
install-info: install-info-recursive
install-man:
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
ps-am:
-uninstall-am: uninstall-binSCRIPTS uninstall-info-am
+uninstall-am: uninstall-binSCRIPTS
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
-uninstall-info: uninstall-info-recursive
-
.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
install-exec-am install-strip uninstall-am
distclean-generic distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
install install-am install-binSCRIPTS install-data \
- install-data-am install-exec install-exec-am install-exec-hook \
- install-info install-info-am install-man install-strip \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-exec-hook install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
installcheck installcheck-am installdirs installdirs-am \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
- uninstall uninstall-am uninstall-binSCRIPTS uninstall-hook \
- uninstall-info-am
+ uninstall uninstall-am uninstall-binSCRIPTS uninstall-hook
install-exec-hook:
can be specified using AM_LIBTOOLFLAGS and target_LIBTOOLFLAGS.
- aclocal now also supports -Wmumble and -Wno-mumble options.
+
+ - New targets mandated by GNU Coding Standards:
+ install-dvi
+ install-html
+ install-ps
+ install-pdf
+ By default they will only install Texinfo manuals.
+ You can customize them with *-local variants:
+ install-dvi-local
+ install-html-local
+ install-ps-local
+ install-pdf-local
+
+ - The undocumented recursive target `uninstall-info' no longer exists.
+ (`uninstall' is in charge of removing all possible documentation
+ flavors, including optional formats such as dvi, ps, or info even
+ when `no-installinfo' is used.)
+
\f
New in 1.9:
# Standard directories from the GNU Coding Standards, and additional
# pkg* directories from Automake. Stored in a hash for fast member check.
my %standard_prefix =
- map { $_ => 1 } (qw(bin data exec include info lib libexec lisp
- localstate man man1 man2 man3 man4 man5 man6
- man7 man8 man9 oldinclude pkgdatadir
- pkgincludedir pkglibdir sbin sharedstate
- sysconf));
+ map { $_ => 1 } (qw(bin data dataroot dvi exec html include info
+ lib libexec lisp localstate man man1 man2 man3
+ man4 man5 man6 man7 man8 man9 oldinclude pdf
+ pkgdatadir pkgincludedir pkglibdir ps sbin
+ sharedstate sysconf));
# Copyright on generated Makefile.ins.
my $gen_copyright = "\
sub handle_data
{
&am_install_var ('-noextra', '-candist', 'data', 'DATA',
- 'data', 'sysconf', 'sharedstate', 'localstate',
+ 'data', 'dataroot', 'dvi', 'html', 'pdf', 'ps',
+ 'sysconf', 'sharedstate', 'localstate',
'pkgdata', 'lisp', 'noinst', 'check');
}
{
# Reject bad hooks.
foreach my $utarg ('uninstall-data-local', 'uninstall-data-hook',
- 'uninstall-exec-local', 'uninstall-exec-hook')
+ 'uninstall-exec-local', 'uninstall-exec-hook',
+ 'uninstall-dvi-local',
+ 'uninstall-html-local',
+ 'uninstall-info-local',
+ 'uninstall-pdf-local',
+ 'uninstall-ps-local')
{
my $x = $utarg;
- $x =~ s/(data|exec)-//;
+ $x =~ s/-.*-/-/;
reject_rule ($utarg, "use `$x', not `$utarg'");
}
"use `install-data-local' or `install-exec-local', "
. "not `install-local'");
- reject_rule ('install-info-local',
- "`install-info-local' target defined but "
- . "`no-installinfo' option not in use")
- unless option 'no-installinfo';
-
# Install the -local hooks.
foreach (keys %dependencies)
{
AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS)
DVIPS = dvips
am__installdirs = "$(DESTDIR)$(infodir)"
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
.dvi.ps:
$(DVIPS) -o $@ $<
+uninstall-dvi-am:
+ @$(NORMAL_UNINSTALL)
+ @list='$(DVIS)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(dvidir)/$$f'"; \
+ rm -f "$(DESTDIR)$(dvidir)/$$f"; \
+ done
+
+uninstall-html-am:
+ @$(NORMAL_UNINSTALL)
+ @list='$(HTMLS)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -rf '$(DESTDIR)$(htmldir)/$$f'"; \
+ rm -rf "$(DESTDIR)$(htmldir)/$$f"; \
+ done
+
uninstall-info-am:
@$(PRE_UNINSTALL)
@if (install-info --version && \
for file in $$list; do \
relfile=`echo "$$file" | sed 's|^.*/||'`; \
relfile_i=`echo "$$relfile" | sed 's|\.info$$||;s|$$|.i|'`; \
- (if cd "$(DESTDIR)$(infodir)"; then \
+ (if test -d "$(DESTDIR)$(infodir)" && cd "$(DESTDIR)$(infodir)"; then \
echo " cd '$(DESTDIR)$(infodir)' && rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]"; \
rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]; \
else :; fi); \
done
+uninstall-pdf-am:
+ @$(NORMAL_UNINSTALL)
+ @list='$(PDFS)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(pdfdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(pdfdir)/$$f"; \
+ done
+
+uninstall-ps-am:
+ @$(NORMAL_UNINSTALL)
+ @list='$(PSS)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(psdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(psdir)/$$f"; \
+ done
+
dist-info: $(INFO_DEPS)
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
list='$(INFO_DEPS)'; \
install-data-am: install-info-am
+install-dvi: install-dvi-am
+
+install-dvi-am: $(DVIS)
+ @$(NORMAL_INSTALL)
+ test -z "$(dvidir)" || $(mkdir_p) "$(DESTDIR)$(dvidir)"
+ @list='$(DVIS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(dvidir)/$$f'"; \
+ $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(dvidir)/$$f"; \
+ done
install-exec-am:
+install-html: install-html-am
+
+install-html-am: $(HTMLS)
+ @$(NORMAL_INSTALL)
+ test -z "$(htmldir)" || $(mkdir_p) "$(DESTDIR)$(htmldir)"
+ @list='$(HTMLS)'; for p in $$list; do \
+ if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ if test -d "$$d$$p"; then \
+ echo " $(mkdir_p) '$(DESTDIR)$(htmldir)/$$f'"; \
+ $(mkdir_p) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \
+ echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \
+ $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f"; \
+ else \
+ echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \
+ $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \
+ fi; \
+ done
install-info: install-info-am
install-info-am: $(INFO_DEPS)
else : ; fi
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am: $(PDFS)
+ @$(NORMAL_INSTALL)
+ test -z "$(pdfdir)" || $(mkdir_p) "$(DESTDIR)$(pdfdir)"
+ @list='$(PDFS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \
+ $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \
+ done
+install-ps: install-ps-am
+
+install-ps-am: $(PSS)
+ @$(NORMAL_INSTALL)
+ test -z "$(psdir)" || $(mkdir_p) "$(DESTDIR)$(psdir)"
+ @list='$(PSS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(psdir)/$$f'"; \
+ $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(psdir)/$$f"; \
+ done
installcheck-am:
maintainer-clean: maintainer-clean-am
ps-am: $(PSS)
-uninstall-am: uninstall-info-am
+uninstall-am: uninstall-dvi-am uninstall-html-am uninstall-info-am \
+ uninstall-pdf-am uninstall-ps-am
.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
ctags dist-info distclean distclean-generic distclean-tags \
distdir dvi dvi-am html html-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
+ install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-aminfo \
maintainer-clean-generic maintainer-clean-vti mostlyclean \
mostlyclean-aminfo mostlyclean-generic mostlyclean-vti pdf \
- pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am
+ pdf-am ps ps-am tags uninstall uninstall-am uninstall-dvi-am \
+ uninstall-html-am uninstall-info-am uninstall-pdf-am \
+ uninstall-ps-am
# 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.
@file{.txi}, or @file{.texinfo} extension. We recommend @file{.texi}
for new manuals.
-Automake generates rules to build @file{.info}, @file{.dvi}, @file{.ps},
-@file{.pdf} and @file{.html} files from your Texinfo sources.
-The @file{.info} files are built by @code{make all} and installed
-by @code{make install} (unless you use @code{no-installinfo}, see below).
-The other files can be built on request by @code{make dvi}, @code{make ps},
-@code{make pdf} and @code{make html}.
+Automake generates rules to build @file{.info}, @file{.dvi},
+@file{.ps}, @file{.pdf} and @file{.html} files from your Texinfo
+sources. Following the GNU Coding Standards, only the @file{.info}
+files are built by @code{make all} and installed by @code{make
+install} (unless you use @code{no-installinfo}, see below).
+Furthermore, @file{.info} files are automatically distributed so that
+Texinfo is not a prerequisite for installing your package.
+
+@trindex dvi
+@trindex html
+@trindex pdf
+@trindex ps
+@trindex install-dvi
+@trindex install-html
+@trindex install-pdf
+@trindex install-ps
+Other documentation formats can be built on request by @code{make
+dvi}, @code{make ps}, @code{make pdf} and @code{make html}, and they
+can be installed with @code{make install-dvi}, @code{make install-ps},
+@code{make install-pdf} and @code{make install-html} explicitly.
+@code{make uninstall} will remove everything: the Texinfo
+documentation installed by default as well as all the above optional
+formats.
+
+All these targets can be extended using @code{-local} rules
+(@pxref{Extending}).
@cindex Texinfo flag, @code{VERSION}
@cindex Texinfo flag, @code{UPDATED}
@trindex install-info
Automake generates an @code{install-info} rule; some people apparently
-use this. By default, info pages are installed by @samp{make install}.
-This can be prevented via the @code{no-installinfo} option.
+use this. By default, info pages are installed by @samp{make
+install}, so running @code{make install-info} is pointless. This can
+be prevented via the @code{no-installinfo} option. In this case,
+@file{.info} files are not installed by default, and user must
+request this explicitly using @code{make install-info}
The following variables are used by the Texinfo build rules.
@trindex check
@trindex check-local
@trindex install
+@trindex install-data
@trindex install-data-local
+@trindex install-dvi
+@trindex install-dvi-local
@trindex install-exec
@trindex install-exec-local
+@trindex install-html
+@trindex install-html-local
+@trindex install-info
+@trindex install-info-local
+@trindex install-pdf
+@trindex install-pdf-local
+@trindex install-ps
+@trindex install-ps-local
@trindex uninstall
@trindex uninstall-local
@trindex mostlyclean
The targets that support a local version are @code{all}, @code{info},
@code{dvi}, @code{ps}, @code{pdf}, @code{html}, @code{check},
-@code{install-data}, @code{install-exec}, @code{uninstall},
-@code{installdirs}, @code{installcheck} and the various @code{clean} targets
+@code{install-data}, @code{install-dvi}, @code{install-exec},
+@code{install-html}, @code{install-info}, @code{install-pdf},
+@code{install-ps}, @code{uninstall}, @code{installdirs},
+@code{installcheck} and the various @code{clean} targets
(@code{mostlyclean}, @code{clean}, @code{distclean}, and
@code{maintainer-clean}). Note that there are no
-@code{uninstall-exec-local} or @code{uninstall-data-local} targets; just
-use @code{uninstall-local}. It doesn't make sense to uninstall just
-data or just executables.
+@code{uninstall-exec-local} or @code{uninstall-data-local} targets;
+just use @code{uninstall-local}. It doesn't make sense to uninstall
+just data or just executables.
For instance, here is one way to install a file in @file{/etc}:
@itemx uninstall
Install or uninstall files (@pxref{Install}).
-@item install-info
-Install only the Texinfo documentation (@pxref{Texinfo}).
+@item install-dvi
+@itemx install-html
+@itemx install-info
+@itemx install-ps
+@itemx install-pdf
+Install only some specific documentation format (@pxref{Texinfo}).
@item installdirs
Create install directories, but do not install any files.
-@set UPDATED 27 December 2004
+@set UPDATED 31 December 2004
@set UPDATED-MONTH December 2004
@set EDITION 1.9a
@set VERSION 1.9a
-@set UPDATED 27 December 2004
+@set UPDATED 31 December 2004
@set UPDATED-MONTH December 2004
@set EDITION 1.9a
@set VERSION 1.9a
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
- install-exec-recursive install-info-recursive \
- install-recursive installcheck-recursive installdirs-recursive \
- pdf-recursive ps-recursive uninstall-info-recursive \
- uninstall-recursive
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
install-dist_perllibDATA: $(dist_perllib_DATA)
@$(NORMAL_INSTALL)
test -z "$(perllibdir)" || $(mkdir_p) "$(DESTDIR)$(perllibdir)"
install-data-am: install-dist_perllibDATA install-nodist_perllibDATA
+install-dvi: install-dvi-recursive
+
install-exec-am:
+install-html: install-html-recursive
+
install-info: install-info-recursive
install-man:
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
ps-am:
-uninstall-am: uninstall-dist_perllibDATA uninstall-info-am \
- uninstall-nodist_perllibDATA
-
-uninstall-info: uninstall-info-recursive
+uninstall-am: uninstall-dist_perllibDATA uninstall-nodist_perllibDATA
.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
install-strip
ctags-recursive distclean distclean-generic distclean-tags \
distdir dvi dvi-am html html-am info info-am install \
install-am install-data install-data-am \
- install-dist_perllibDATA install-exec install-exec-am \
+ install-dist_perllibDATA install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
install-info install-info-am install-man \
- install-nodist_perllibDATA install-strip installcheck \
+ install-nodist_perllibDATA install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
installcheck-am installdirs installdirs-am maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
- uninstall-dist_perllibDATA uninstall-info-am \
- uninstall-nodist_perllibDATA
+ uninstall-dist_perllibDATA uninstall-nodist_perllibDATA
Config.pm: Config.in Makefile
'install-man' => [],
'uninstall-man' => [],
+ 'install-dvi' => [],
+ 'install-dvi-am' => [],
+ 'install-html' => [],
+ 'install-html-am' => [],
'install-info' => [],
'install-info-am' => [],
- 'uninstall-info' => [],
+ 'install-pdf' => [],
+ 'install-pdf-am' => [],
+ 'install-ps' => [],
+ 'install-ps-am' => [],
'installcheck-am' => [],
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
tags: TAGS
TAGS:
install-data-am:
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am:
.MAKE: install-am install-strip
.PHONY: all all-am check check-TESTS check-am clean clean-generic \
distclean distclean-generic distdir dvi dvi-am html html-am \
info info-am install install-am install-data install-data-am \
- install-exec install-exec-am install-info install-info-am \
- install-man install-strip installcheck installcheck-am \
+ install-dvi install-dvi-am install-exec install-exec-am \
+ install-html install-html-am install-info install-info-am \
+ install-man install-pdf install-pdf-am install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-info-am
+ uninstall-am
# 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.
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
- install-exec-recursive install-info-recursive \
- install-recursive installcheck-recursive installdirs-recursive \
- pdf-recursive ps-recursive uninstall-info-recursive \
- uninstall-recursive
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
install-dist_pkgvdataDATA: $(dist_pkgvdata_DATA)
@$(NORMAL_INSTALL)
test -z "$(pkgvdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgvdatadir)"
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+install-dvi: install-dvi-recursive
+
install-exec-am:
+install-html: install-html-recursive
+
install-info: install-info-recursive
install-man:
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
installcheck-am: installcheck-local
maintainer-clean: maintainer-clean-recursive
ps-am:
-uninstall-am: uninstall-dist_pkgvdataDATA uninstall-dist_scriptDATA \
- uninstall-info-am
-
-uninstall-info: uninstall-info-recursive
+uninstall-am: uninstall-dist_pkgvdataDATA uninstall-dist_scriptDATA
.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
install-data-am install-strip
ctags-recursive distclean distclean-generic distclean-tags \
distdir dvi dvi-am html html-am info info-am install \
install-am install-data install-data-am install-data-hook \
- install-dist_pkgvdataDATA install-dist_scriptDATA install-exec \
- install-exec-am install-info install-info-am install-man \
+ install-dist_pkgvdataDATA install-dist_scriptDATA install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
install-strip installcheck installcheck-am installcheck-local \
installdirs installdirs-am maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
- uninstall-dist_pkgvdataDATA uninstall-dist_scriptDATA \
- uninstall-info-am
+ uninstall-dist_pkgvdataDATA uninstall-dist_scriptDATA
install-data-hook:
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
install-dist_amDATA: $(dist_am_DATA)
@$(NORMAL_INSTALL)
test -z "$(amdir)" || $(mkdir_p) "$(DESTDIR)$(amdir)"
install-data-am: install-dist_amDATA
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
ps-am:
-uninstall-am: uninstall-dist_amDATA uninstall-info-am
+uninstall-am: uninstall-dist_amDATA
.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
distclean-generic distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am \
- install-dist_amDATA install-exec install-exec-am install-info \
- install-info-am install-man install-strip installcheck \
+ install-dist_amDATA install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
- pdf-am ps ps-am uninstall uninstall-am uninstall-dist_amDATA \
- uninstall-info-am
+ pdf-am ps ps-am uninstall uninstall-am uninstall-dist_amDATA
# 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.
install-data-am: install-info-am
endif %?LOCAL-TEXIS%
endif %?INSTALL-INFO%
-.PHONY: install-info
+.PHONY: \
+ install-dvi install-dvi-am \
+ install-html install-html-am \
+ install-info install-info-am \
+ install-pdf install-pdf-am \
+ install-ps install-ps-am
+
if %?SUBDIRS%
-RECURSIVE_TARGETS += install-info-recursive
+RECURSIVE_TARGETS += \
+ install-dvi-recursive \
+ install-html-recursive \
+ install-info-recursive \
+ install-pdf-recursive \
+ install-ps-recursive
+install-dvi: install-dvi-recursive
+install-html: install-html-recursive
install-info: install-info-recursive
+install-pdf: install-pdf-recursive
+install-ps: install-ps-recursive
else !%?SUBDIRS%
+install-dvi: install-dvi-am
+install-html: install-html-am
install-info: install-info-am
+install-pdf: install-pdf-am
+install-ps: install-ps-am
endif !%?SUBDIRS%
-.PHONY: install-info-am
if %?LOCAL-TEXIS%
+
+include inst-vars.am
+
+install-dvi-am: $(DVIS)
+ @$(NORMAL_INSTALL)
+ test -z "$(dvidir)" || $(mkdir_p) "$(DESTDIR)$(dvidir)"
+ @list='$(DVIS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(dvidir)/$$f'"; \
+ $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(dvidir)/$$f"; \
+ done
+
+install-html-am: $(HTMLS)
+ @$(NORMAL_INSTALL)
+ test -z "$(htmldir)" || $(mkdir_p) "$(DESTDIR)$(htmldir)"
+ @list='$(HTMLS)'; for p in $$list; do \
+ if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ if test -d "$$d$$p"; then \
+ echo " $(mkdir_p) '$(DESTDIR)$(htmldir)/$$f'"; \
+ $(mkdir_p) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \
+ echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \
+ $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f"; \
+ else \
+ echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \
+ $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \
+ fi; \
+ done
+
install-info-am: $(INFO_DEPS)
@$(NORMAL_INSTALL)
test -z "$(infodir)" || $(mkdir_p) "$(DESTDIR)$(infodir)"
install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\
done; \
else : ; fi
+
+install-pdf-am: $(PDFS)
+ @$(NORMAL_INSTALL)
+ test -z "$(pdfdir)" || $(mkdir_p) "$(DESTDIR)$(pdfdir)"
+ @list='$(PDFS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \
+ $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \
+ done
+
+install-ps-am: $(PSS)
+ @$(NORMAL_INSTALL)
+ test -z "$(psdir)" || $(mkdir_p) "$(DESTDIR)$(psdir)"
+ @list='$(PSS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(psdir)/$$f'"; \
+ $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(psdir)/$$f"; \
+ done
+
else ! %?LOCAL-TEXIS%
+install-dvi-am:
+install-html-am:
install-info-am:
+install-pdf-am:
+install-ps-am:
endif ! %?LOCAL-TEXIS%
## Uninstalling. ##
## -------------- ##
-?SUBDIRS?RECURSIVE_TARGETS += uninstall-info-recursive
-?SUBDIRS?uninstall-info: uninstall-info-recursive
-?INSTALL-INFO?uninstall-am: uninstall-info-am
+if %?LOCAL-TEXIS%
+.PHONY uninstall-am: \
+ uninstall-dvi-am \
+ uninstall-html-am \
+ uninstall-info-am \
+ uninstall-ps-am \
+ uninstall-pdf-am
-.PHONY: uninstall-info-am
+uninstall-dvi-am:
+ @$(NORMAL_UNINSTALL)
+ @list='$(DVIS)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(dvidir)/$$f'"; \
+ rm -f "$(DESTDIR)$(dvidir)/$$f"; \
+ done
+
+uninstall-html-am:
+ @$(NORMAL_UNINSTALL)
+ @list='$(HTMLS)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+## $f can be a directory, hence the -r.
+ echo " rm -rf '$(DESTDIR)$(htmldir)/$$f'"; \
+ rm -rf "$(DESTDIR)$(htmldir)/$$f"; \
+ done
-if %?LOCAL-TEXIS%
uninstall-info-am:
@$(PRE_UNINSTALL)
## Run two loops here so that we can handle PRE_UNINSTALL and
relfile=`echo "$$file" | sed 's|^.*/||'`; \
## DJGPP-style info files. See comment in install-info-am.
relfile_i=`echo "$$relfile" | sed 's|\.info$$||;s|$$|.i|'`; \
- (if cd "$(DESTDIR)$(infodir)"; then \
+ (if test -d "$(DESTDIR)$(infodir)" && cd "$(DESTDIR)$(infodir)"; then \
echo " cd '$(DESTDIR)$(infodir)' && rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]"; \
rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]; \
else :; fi); \
done
-else ! %?LOCAL-TEXIS%
-uninstall-info-am:
-endif ! %?LOCAL-TEXIS%
+
+uninstall-pdf-am:
+ @$(NORMAL_UNINSTALL)
+ @list='$(PDFS)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(pdfdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(pdfdir)/$$f"; \
+ done
+
+uninstall-ps-am:
+ @$(NORMAL_UNINSTALL)
+ @list='$(PSS)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(psdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(psdir)/$$f"; \
+ done
+endif %?LOCAL-TEXIS%
if %?LOCAL-TEXIS%
.PHONY: dist-info
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
install-dist_m4dataDATA: $(dist_m4data_DATA)
@$(NORMAL_INSTALL)
test -z "$(m4datadir)" || $(mkdir_p) "$(DESTDIR)$(m4datadir)"
install-data-am: install-dist_m4dataDATA
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
ps-am:
-uninstall-am: uninstall-dist_m4dataDATA uninstall-info-am
+uninstall-am: uninstall-dist_m4dataDATA
.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
distclean-generic distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am \
- install-dist_m4dataDATA install-exec install-exec-am \
- install-info install-info-am install-man install-strip \
+ install-dist_m4dataDATA install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
pdf-am ps ps-am uninstall uninstall-am \
- uninstall-dist_m4dataDATA uninstall-info-am
+ uninstall-dist_m4dataDATA
# We build amversion.m4 here, instead of from config.status,
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
automake-${APIVERSION}: $(top_builddir)/config.status $(srcdir)/automake.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-uninstall-info-am:
tags: TAGS
TAGS:
install-data-am:
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am:
.MAKE: install-am install-strip
.PHONY: all all-am check check-TESTS check-am clean clean-generic \
distclean distclean-generic distclean-local distdir dvi dvi-am \
html html-am info info-am install install-am install-data \
- install-data-am install-exec install-exec-am install-info \
- install-info-am install-man install-strip installcheck \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
- pdf-am ps ps-am uninstall uninstall-am uninstall-info-am
+ pdf-am ps ps-am uninstall uninstall-am
distclean-local:
#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1998, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
#
# This file is part of GNU Automake.
#
set -e
cat > Makefile.am << 'EOF'
-html_DATA = zot.html
+quuz_DATA = zot.html
pkgdata_DATA = qbert
EOF
$ACLOCAL
AUTOMAKE_fails
grep 'pkgdatadir' stderr && exit 1
-grep 'Makefile.am:1:.*htmldir.*undefined' stderr
+grep 'Makefile.am:1:.*quuzdir.*undefined' stderr
#! /bin/sh
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
#
# This file is part of GNU Automake.
#
# Test for another issue. Overriding html: should cause only one
# html: rule to be output.
-test `grep html: Makefile.in | wc -l` = 1
+test `grep '^html:' Makefile.in | wc -l` = 1
# ps: should be output in two conditions
-test `grep ps: Makefile.in | wc -l` = 2
+test `grep '[^-]ps:' Makefile.in | wc -l` = 2
grep '@COND_TRUE@ps: mine' Makefile.in
grep '@COND_FALSE@ps: ps-am' Makefile.in
#! /bin/sh
-# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
#
# This file is part of GNU Automake.
#
grep dvi-recursive Makefile.in
grep '[^-]info-recursive' Makefile.in
grep '[^n]install-info-recursive' Makefile.in
-grep uninstall-info-recursive Makefile.in
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
-# Test support for building HTML documentation.
+# Test support for building HTML documentation, and the many
+# install-DOC flavors.
required='makeinfo-html tex'
. ./defs || exit 1
set -e
-cat >>configure.in <<EOF
+cat >>configure.in <<\EOF
AC_CONFIG_FILES([rec/Makefile])
+
+# At the time of writing, Autoconf does not supplies any of these
+# definitions (and those below are purposedly not those of the standard).
+AC_SUBST([dvidir], ['${datadir}/${PACKAGE}/dvi'])
+AC_SUBST([htmldir], ['${datadir}/${PACKAGE}/html'])
+AC_SUBST([pdfdir], ['${datadir}/${PACKAGE}/pdf'])
+AC_SUBST([psdir], ['${datadir}/${PACKAGE}/ps'])
+
AC_OUTPUT
EOF
cat > Makefile.am << 'END'
SUBDIRS = rec
-info_TEXINFOS = main.texi sub/main.texi
+info_TEXINFOS = main.texi sub/main2.texi
END
cat > main.texi << 'END'
END
mkdir sub
+cat > sub/main2.texi << 'END'
+\input texinfo
+@setfilename main2.info
+@settitle main2
+@node Top
+Hello walls.
+@bye
+END
+
mkdir rec
-cp main.texi sub/main.texi
-cp main.texi rec/main.texi
+cat > rec/main3.texi << 'END'
+\input texinfo
+@setfilename main3.info
+@settitle main3
+@node Top
+Hello walls.
+@bye
+END
cat > rec/Makefile.am << 'END'
-info_TEXINFOS = main.texi
+info_TEXINFOS = main3.texi
+
+install-pdf-local:
+ @$(mkdir_p) "$(pdfdir)"
+ :> "$(pdfdir)/hello"
+uninstall-local:
+ rm -f "$(pdfdir)/hello"
END
$ACLOCAL
# Test production of split-per-node HTML.
$MAKE html
test -d main.html
-test -d sub/main.html
-test -d rec/main.html
+test -d sub/main2.html
+test -d rec/main3.html
# Rebuilding main.html should cause its timestamp to be updated.
test `ls -1td main.texi main.html | sed 1q` = main.html
$MAKE clean
test ! -d main.html
-test ! -d sub/main.html
-test ! -d rec/main.html
+test ! -d sub/main2.html
+test ! -d rec/main3.html
# Test production of a single HTML file.
MAKEINFOFLAGS=--no-split $MAKE -e html
test -f main.html
-test -f sub/main.html
-test -f rec/main.html
+test -f sub/main2.html
+test -f rec/main3.html
$MAKE clean
test ! -f main.html
-test ! -f sub/main.html
-test ! -f rec/main.html
+test ! -f sub/main2.html
+test ! -f rec/main3.html
# Make sure AM_MAKEINFOHTMLFLAGS is supported, and override AM_MAKEINFO.
cat >>Makefile.am <<\EOF
AM_MAKEINFOFLAGS=--unsupported-option
EOF
$AUTOMAKE
-./configure
+./configure --prefix "`pwd`"
$MAKE html
test -f main.html
-test -f sub/main.html
-test -d rec/main.html
+test -f sub/main2.html
+test -d rec/main3.html
$MAKE clean
test ! -f main.html
-test ! -f sub/main.html
-test ! -d rec/main.html
+test ! -f sub/main2.html
+test ! -d rec/main3.html
+
+$MAKE install-html
+test -f share/txinfo21/html/main.html
+test -f share/txinfo21/html/main2.html
+test -d share/txinfo21/html/main3.html
+$MAKE uninstall
+test ! -f share/txinfo21/html/main.html
+test ! -f share/txinfo21/html/main2.html
+test ! -d share/txinfo21/html/main3.html
+
+$MAKE install-dvi
+test -f share/txinfo21/dvi/main.dvi
+test -f share/txinfo21/dvi/main2.dvi
+test -f share/txinfo21/dvi/main3.dvi
+$MAKE uninstall
+test ! -f share/txinfo21/dvi/main.dvi
+test ! -f share/txinfo21/dvi/main2.dvi
+test ! -f share/txinfo21/dvi/main3.dvi
+
+(dvips --help 2>/dev/null >/dev/null) || exit 77
+
+$MAKE install-ps
+test -f share/txinfo21/ps/main.ps
+test -f share/txinfo21/ps/main2.ps
+test -f share/txinfo21/ps/main3.ps
+$MAKE uninstall
+test ! -f share/txinfo21/ps/main.ps
+test ! -f share/txinfo21/ps/main2.ps
+test ! -f share/txinfo21/ps/main3.ps
+
+(pdfetex --help 2>/dev/null >/dev/null) ||
+ (pdftex --help 2>/dev/null >/dev/null) || exit 77
+
+$MAKE install-pdf
+test -f share/txinfo21/pdf/main.pdf
+test -f share/txinfo21/pdf/main2.pdf
+test -f share/txinfo21/pdf/main3.pdf
+test -f share/txinfo21/pdf/hello
+$MAKE uninstall
+test ! -f share/txinfo21/pdf/main.pdf
+test ! -f share/txinfo21/pdf/main2.pdf
+test ! -f share/txinfo21/pdf/main3.pdf
+test ! -f share/txinfo21/pdf/hello
projects / platform / upstream / automake.git / commitdiff