[Fakeroot-commits] [SCM] fakeroot branch, upstream, updated. debian/1.14.3-200-gb232f8a

[Clint Adams]

The following commit has been merged in the upstream branch:
commit a87bf56e9295629326e5302803ce1f80d3a6c8dd
Author: Akim Demaille <demaille at gostai.com>
Date:   Thu Dec 11 16:39:01 2008 +0100

    Make bootstraping easier.

diff --git a/Makefile.am b/Makefile.am
index 66e21e3..12176f7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,5 @@
 AUTOMAKE_OPTIONS=foreign
+ACLOCAL_AMFLAGS = -I build-aux
 SUBDIRS=scripts doc test
 
 noinst_LTLIBRARIES = libcommunicate.la
@@ -29,9 +30,9 @@ EXTRA_DIST=wrapawk wrapfunc.inp                        \
 CLEAN_FILES=fakerootconfig.h
 
 wrapped.h wrapdef.h wrapstruct.h wraptmpf.h:wrapawk wrapfunc.inp
-	awk -f $(srcdir)/wrapawk < $(srcdir)/wrapfunc.inp  
+	awk -f $(srcdir)/wrapawk < $(srcdir)/wrapfunc.inp
 
-libfakeroot.lo:libfakeroot.c wrapdef.h wrapstruct.h wraptmpf.h 
+libfakeroot.lo:libfakeroot.c wrapdef.h wrapstruct.h wraptmpf.h
 
 fakerootconfig.h: ./config.status
 	CONFIG_FILES= CONFIG_HEADERS= /bin/sh ./config.status
diff --git a/configure.ac b/configure.ac
index 5bf681d..38f54ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT([fakeroot],[FAKEROOT_VERSION],[schizo at debian.org],[fakeroot])
 AC_PREREQ(2.61)
+AC_CONFIG_MACRO_DIR([build-aux])
 LT_PREREQ(2.1a)
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE

-- 
fakeroot