diff options
| author | Werner Koch <wk@gnupg.org> | 2001-12-18 15:30:01 +0000 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2001-12-18 15:30:01 +0000 |
| commit | eb5e137dd74fefd8606606b2de835ca4e3bf235b (patch) | |
| tree | f2afcc7e8e419346f8bc378cd7e87035a4515afd /acinclude.m4 | |
| parent | 4d7c31417d7d49d839dad9016a0696a264229c3e (diff) | |
| download | libgcrypt-eb5e137dd74fefd8606606b2de835ca4e3bf235b.tar.gz | |
* Makefile.am (dist-hook): Only look in mpi and scripts for
distfiles; this way we don't include those of a stale "make dist"
directory.
* acinclude.m4 (GNUPG_FIX_HDR_VERSION): Make it work with the new
automake.
* configure.ac: Don't chmod db2any.
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index e1d74f52..2e0a3743 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -48,20 +48,23 @@ AC_DEFUN(GNUPG_CHECK_TYPEDEF, dnl GNUPG_FIX_HDR_VERSION(FILE, NAME) dnl Make the version number in gcrypt/gcrypt.h the same as the one here. dnl (this is easier than to have a .in file just for one substitution) +dnl We must use a temp file in the current directory because make distcheck +dnl install all sourcefiles RO. dnl AC_DEFUN(GNUPG_FIX_HDR_VERSION, - [ sed "s/^#define $2 \".*/#define $2 \"$VERSION\"/" $srcdir/$1 > $srcdir/$1.tmp - if cmp -s $srcdir/$1 $srcdir/$1.tmp 2>/dev/null; then - rm -f $srcdir/$1.tmp + [ sed "s/^#define $2 \".*/#define $2 \"$VERSION\"/" $srcdir/$1 > fixhdr.tmp + if cmp -s $srcdir/$1 fixhdr.tmp 2>/dev/null; then + rm -f fixhdr.tmp else rm -f $srcdir/$1 - if mv $srcdir/$1.tmp $srcdir/$1 ; then + if mv fixhdr.tmp $srcdir/$1 ; then : else AC_MSG_ERROR([[ +*** *** Failed to fix the version string macro $2 in $1. -*** The old file has been saved as $1.tmp - ]]) +*** The old file has been saved as fixhdr.tmp +***]]) fi AC_MSG_WARN([fixed the $2 macro in $1]) fi |