[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
FYI: support install-{dvi,html,ps,pdf}
|
From: |
Alexandre Duret-Lutz |
|
Subject: |
FYI: support install-{dvi,html,ps,pdf} |
|
Date: |
Fri, 31 Dec 2004 00:10:22 +0100 |
|
User-agent: |
Gnus/5.1003 (Gnus v5.10.3) Emacs/21.3.50 (gnu/linux) |
I'm installing this on HEAD. Do not expect too much from this right
now, because the standard directory variables it relies upon
($dvidir, $htmldir, $psdir, $pdfdir), are not yet defined by Autoconf.
You can AC_SUBST these yourself, or send a patch to Autoconf :)
2004-12-30 Alexandre Duret-Lutz <address@hidden>
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.
Index: NEWS
===================================================================
RCS file: /cvs/automake/automake/NEWS,v
retrieving revision 1.291
diff -u -r1.291 NEWS
--- NEWS 12 Dec 2004 23:39:01 -0000 1.291
+++ NEWS 30 Dec 2004 22:29:37 -0000
@@ -18,6 +18,24 @@
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.)
+
New in 1.9:
Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1593
diff -u -r1.1593 automake.in
--- automake.in 27 Dec 2004 21:25:42 -0000 1.1593
+++ automake.in 30 Dec 2004 22:29:38 -0000
@@ -236,11 +236,11 @@
# 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 = "\
@@ -3322,7 +3322,8 @@
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');
}
@@ -4410,10 +4411,15 @@
{
# 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'");
}
@@ -4421,11 +4427,6 @@
"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)
{
Index: doc/automake.texi
===================================================================
RCS file: /cvs/automake/automake/doc/automake.texi,v
retrieving revision 1.81
diff -u -r1.81 automake.texi
--- doc/automake.texi 18 Dec 2004 17:54:28 -0000 1.81
+++ doc/automake.texi 30 Dec 2004 22:29:40 -0000
@@ -5437,12 +5437,32 @@
@file{.txi}, or @file{.texinfo} extension. We recommend @file{.texi}
for new manuals.
-Automake generates rules to build @file{.info}, @file{.dvi}, @file{.ps},
address@hidden 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},
address@hidden pdf} and @code{make html}.
+Automake generates rules to build @file{.info}, @file{.dvi},
address@hidden, @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.
+
address@hidden dvi
address@hidden html
address@hidden pdf
address@hidden ps
address@hidden install-dvi
address@hidden install-html
address@hidden install-pdf
address@hidden 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},
address@hidden install-pdf} and @code{make install-html} explicitly.
address@hidden 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}
@@ -5524,8 +5544,11 @@
@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,
address@hidden 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.
@@ -7068,9 +7091,20 @@
@trindex check
@trindex check-local
@trindex install
address@hidden install-data
@trindex install-data-local
address@hidden install-dvi
address@hidden install-dvi-local
@trindex install-exec
@trindex install-exec-local
address@hidden install-html
address@hidden install-html-local
address@hidden install-info
address@hidden install-info-local
address@hidden install-pdf
address@hidden install-pdf-local
address@hidden install-ps
address@hidden install-ps-local
@trindex uninstall
@trindex uninstall-local
@trindex mostlyclean
@@ -7086,13 +7120,15 @@
The targets that support a local version are @code{all}, @code{info},
@code{dvi}, @code{ps}, @code{pdf}, @code{html}, @code{check},
address@hidden, @code{install-exec}, @code{uninstall},
address@hidden, @code{installcheck} and the various @code{clean} targets
address@hidden, @code{install-dvi}, @code{install-exec},
address@hidden, @code{install-info}, @code{install-pdf},
address@hidden, @code{uninstall}, @code{installdirs},
address@hidden and the various @code{clean} targets
(@code{mostlyclean}, @code{clean}, @code{distclean}, and
@code{maintainer-clean}). Note that there are no
address@hidden or @code{uninstall-data-local} targets; just
-use @code{uninstall-local}. It doesn't make sense to uninstall just
-data or just executables.
address@hidden 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}:
@@ -7204,8 +7240,12 @@
@itemx uninstall
Install or uninstall files (@pxref{Install}).
address@hidden install-info
-Install only the Texinfo documentation (@pxref{Texinfo}).
address@hidden install-dvi
address@hidden install-html
address@hidden install-info
address@hidden install-ps
address@hidden install-pdf
+Install only some specific documentation format (@pxref{Texinfo}).
@item installdirs
Create install directories, but do not install any files.
Index: lib/Automake/Rule.pm
===================================================================
RCS file: /cvs/automake/automake/lib/Automake/Rule.pm,v
retrieving revision 1.8
diff -u -r1.8 Rule.pm
--- lib/Automake/Rule.pm 27 Dec 2004 20:38:21 -0000 1.8
+++ lib/Automake/Rule.pm 30 Dec 2004 22:29:40 -0000
@@ -328,9 +328,16 @@
'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' => [],
Index: lib/am/texinfos.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/texinfos.am,v
retrieving revision 1.114
diff -u -r1.114 texinfos.am
--- lib/am/texinfos.am 27 Dec 2004 21:18:52 -0000 1.114
+++ lib/am/texinfos.am 30 Dec 2004 22:29:40 -0000
@@ -111,16 +111,64 @@
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)"
@@ -180,8 +228,33 @@
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%
@@ -189,13 +262,31 @@
## 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
@@ -217,14 +308,28 @@
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
Index: tests/txinfo21.test
===================================================================
RCS file: /cvs/automake/automake/tests/txinfo21.test,v
retrieving revision 1.3
diff -u -r1.3 txinfo21.test
--- tests/txinfo21.test 17 Jul 2004 09:48:11 -0000 1.3
+++ tests/txinfo21.test 30 Dec 2004 22:29:40 -0000
@@ -18,21 +18,30 @@
# 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'
@@ -45,12 +54,33 @@
END
mkdir sub
+cat > sub/main2.texi << 'END'
+\input texinfo
address@hidden main2.info
address@hidden main2
address@hidden Top
+Hello walls.
address@hidden
+END
+
mkdir rec
-cp main.texi sub/main.texi
-cp main.texi rec/main.texi
+cat > rec/main3.texi << 'END'
+\input texinfo
address@hidden main3.info
address@hidden main3
address@hidden Top
+Hello walls.
address@hidden
+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
@@ -65,8 +95,8 @@
# 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
@@ -77,18 +107,18 @@
$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
@@ -96,12 +126,55 @@
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
Index: tests/exdir2.test
===================================================================
RCS file: /cvs/automake/automake/tests/exdir2.test,v
retrieving revision 1.4
diff -u -r1.4 exdir2.test
--- tests/exdir2.test 3 Jul 2003 18:58:50 -0000 1.4
+++ tests/exdir2.test 30 Dec 2004 22:34:55 -0000
@@ -1,5 +1,5 @@
#! /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.
#
@@ -25,11 +25,11 @@
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
Index: tests/overrid.test
===================================================================
RCS file: /cvs/automake/automake/tests/overrid.test,v
retrieving revision 1.4
diff -u -r1.4 overrid.test
--- tests/overrid.test 17 Nov 2003 19:08:30 -0000 1.4
+++ tests/overrid.test 30 Dec 2004 22:59:12 -0000
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
#
# This file is part of GNU Automake.
#
@@ -63,9 +63,9 @@
# 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 '@address@hidden: mine' Makefile.in
grep '@address@hidden: ps-am' Makefile.in
Index: tests/txinfo10.test
===================================================================
RCS file: /cvs/automake/automake/tests/txinfo10.test,v
retrieving revision 1.2
diff -u -r1.2 txinfo10.test
--- tests/txinfo10.test 14 Nov 2003 21:26:01 -0000 1.2
+++ tests/txinfo10.test 30 Dec 2004 23:02:49 -0000
@@ -1,5 +1,5 @@
#! /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.
#
@@ -43,4 +43,3 @@
grep dvi-recursive Makefile.in
grep '[^-]info-recursive' Makefile.in
grep '[^n]install-info-recursive' Makefile.in
-grep uninstall-info-recursive Makefile.in
--
Alexandre Duret-Lutz
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- FYI: support install-{dvi,html,ps,pdf},
Alexandre Duret-Lutz <=