diff options
| author | Bruno Haible <bruno@clisp.org> | 2009-05-31 11:03:47 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2009-05-31 11:03:47 +0200 |
| commit | 9b9a157e282afc38068eab6954a834f59fcbd718 (patch) | |
| tree | 9e97c29ad2af282b11d89f243b093fe26c2e66e7 | |
| parent | a0defa9cce5b4a7ea6028584288cde169fbb4ef3 (diff) | |
| download | libunistring-9b9a157e282afc38068eab6954a834f59fcbd718.tar.gz | |
Use dist-hook instead of old distdir hack.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | doc/Makefile.am | 3 | ||||
| -rw-r--r-- | m4/fixautomake.m4 | 26 |
4 files changed, 8 insertions, 30 deletions
@@ -1,3 +1,9 @@ +2009-05-31 Bruno Haible <bruno@clisp.org> + + * doc/Makefile.am: Use dist-hook instead of old distdir hack. + * configure.ac (doc/Makefile.am): Don't invoke FIX_MAKEFILE_DISTRIB. + * m4/fixautomake.m4: Remove file. + 2009-05-30 Bruno Haible <bruno@clisp.org> Generate a compiler independent <unistring/stdint.h>. diff --git a/configure.ac b/configure.ac index 5599c3e..4c51345 100644 --- a/configure.ac +++ b/configure.ac @@ -143,8 +143,7 @@ AC_PATH_PROG([DVIPS], [dvips], [$ac_aux_dir_abs/missing dvips]) AC_PATH_PROG([PERL], [perl], [$ac_aux_dir_abs/missing perl]) AC_CONFIG_FILES([Makefile]) -AC_CONFIG_FILES([doc/Makefile], - [FIX_MAKEFILE_DISTRIB]) +AC_CONFIG_FILES([doc/Makefile]) AC_CONFIG_FILES([gnulib-local/Makefile]) AC_CONFIG_FILES([lib/Makefile]) AC_CONFIG_FILES([lib/exported.sh]) diff --git a/doc/Makefile.am b/doc/Makefile.am index bf1549f..a66c69d 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -63,8 +63,7 @@ all-local: html-local install-data-local: install-html installdirs-local: installdirs-html uninstall-local: uninstall-html -# Hidden from automake, but really activated. Works around an automake-1.5 bug. -#distdir: dist-html +dist-hook: dist-html html-local: html-split # Override of automake's definition. The HTML files we want to distribute are diff --git a/m4/fixautomake.m4 b/m4/fixautomake.m4 deleted file mode 100644 index 989220d..0000000 --- a/m4/fixautomake.m4 +++ /dev/null @@ -1,26 +0,0 @@ -# fixautomake.m4 serial 8 (gettext-0.18) -dnl Copyright (C) 2002-2003, 2006, 2009 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl From Bruno Haible - -dnl Fix an automake-1.5-1.11 bug: the distrib rule is omitted. -AC_DEFUN([FIX_MAKEFILE_DISTRIB], [ - sed -e 's,^#distdir:,distdir:,' < $ac_file > $ac_file.tmp - mv $ac_file.tmp $ac_file -]) - -dnl Fix an automake-1.9-1.11 bug: the distrib rule is not extensible. -dnl Insert a invocation of the distdir1 target inside the distdir commands, -dnl after $(distdir) has been erased and re-created. -AC_DEFUN([FIX_MAKEFILE_TOPDIR_DISTRIB], [ - sed_script='/mkdir "*\$(distdir)"*$/{a\ -\ $(MAKE) distdir1 -}' - sed -e "$sed_script" < $ac_file > $ac_file.tmp - mv $ac_file.tmp $ac_file -]) |