diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-06-15 22:52:36 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-06-17 09:57:34 +0200 |
| commit | a0c7b6a3c28aec6673b7c2f489dd3dfc676605ad (patch) | |
| tree | e561605452529331852ce83468ec3d71faa4073b /lib/am/texibuild.am | |
| parent | 5148089bd2a5d5c800c787199d18a2791a310864 (diff) | |
| download | automake-a0c7b6a3c28aec6673b7c2f489dd3dfc676605ad.tar.gz | |
[ng] texi: drop support for suffix-less info files
Such support is seldom used, and will get in the way of future, useful
refactorings. We can still re-introduce it at a later time, after the
dust is settled, if there are users' requests in this direction.
* automake.in (scan_texinfo_file): Error out if a input '.texi' file
specifies an output (in the '@setfilename' directive) that doesn't have
a '.info' extension.
(output_texinfo_build_rules): Simplify, by assuming generated info
files ought to have the '.info' extension.
* lib/am/texibuild.am: Likewise.
* NG-NEWS: Update
* t/txinfo3.sh: Remove as obsolete.
* t/txinfo-unrecognized-extension-2.sh: New test.
* t/primary-prefix-valid-couples.sh: Adjust to avoid spurious failures.
* t/txinfo17.sh: Likewise.
* t/txinfo20.sh: Likewise.
* t/vtexi2.sh: Likewise.
* t/mdate2.sh: Likewise.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 'lib/am/texibuild.am')
| -rw-r--r-- | lib/am/texibuild.am | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/am/texibuild.am b/lib/am/texibuild.am index 349ef7ad5..dad84f367 100644 --- a/lib/am/texibuild.am +++ b/lib/am/texibuild.am @@ -14,7 +14,7 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see <http://www.gnu.org/licenses/>. -%%DEST_SUFFIX%: %%SOURCE_SUFFIX% +%.info: %%SOURCE_SUFFIX% $(if $(am__info_insrc),,@$(am__ensure_target_dir_exists)) ## Back up the info files before running makeinfo. This is the cheapest ## way to ensure that @@ -48,7 +48,7 @@ fi; \ rm -rf $$backupdir; exit $$rc -INFO_DEPS += %DEST_INFO_PREFIX%%DEST_SUFFIX% +INFO_DEPS += %DEST_INFO_PREFIX%.info %.dvi: %%SOURCE_SUFFIX% %AM_V_TEXI2DVI%$(am__ensure_target_dir_exists) && \ @@ -100,14 +100,14 @@ INFO_DEPS += %DEST_INFO_PREFIX%%DEST_SUFFIX% exit 1; \ fi -%DEST_INFO_PREFIX%%DEST_SUFFIX%: %SOURCE_REAL% %DEPS% -?INSRC?%DEST_INFO_PREFIX%%DEST_SUFFIX%: am__info_insrc=yes +%DEST_INFO_PREFIX%.info: %SOURCE_REAL% %DEPS% +?INSRC?%DEST_INFO_PREFIX%.info: am__info_insrc=yes %DEST_PREFIX%.dvi: %SOURCE_REAL% %DEPS% %DEST_PREFIX%.pdf: %SOURCE_REAL% %DEPS% %DEST_PREFIX%.html: %SOURCE_REAL% %DEPS% -%DEST_INFO_PREFIX%%DEST_SUFFIX% \ +%DEST_INFO_PREFIX%.info \ %DEST_PREFIX%.dvi \ %DEST_PREFIX%.pdf \ %DEST_PREFIX%.html \ |