[SCM] The rsync repository. - branch master updated

[Rsync CVS commit messages]

The branch, master has been updated
       via  2ac35b4 Pass -I option to aclocal.
      from  3bc3197 Use AS_IF instead of plain if/then/fi

https://git.samba.org/?p=rsync.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 2ac35b45071c7bfd8be6be41bfd45326f1f57bce
Author: Wayne Davison <wayned at samba.org>
Date:   Fri May 1 15:17:41 2015 -0700

    Pass -I option to aclocal.

-----------------------------------------------------------------------

Summary of changes:
 Makefile.in        | 2 +-
 prepare-source.mak | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/Makefile.in b/Makefile.in
index 4e20827..2fddfef 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -145,7 +145,7 @@ conf:
 	cd $(srcdir) && $(MAKE) -f prepare-source.mak conf
 
 aclocal.m4: m4/*.m4
-	aclocal
+	aclocal -I $(srcdir)/m4
 
 configure.sh config.h.in: configure.ac aclocal.m4
 	@if test -f configure.sh; then cp -p configure.sh configure.sh.old; else touch configure.sh.old; fi
diff --git a/prepare-source.mak b/prepare-source.mak
index efb6228..ad291fe 100644
--- a/prepare-source.mak
+++ b/prepare-source.mak
@@ -1,7 +1,7 @@
 conf: configure.sh config.h.in
 
 aclocal.m4:
-	aclocal
+	aclocal -I m4
 
 configure.sh: configure.ac aclocal.m4
 	autoconf -o configure.sh


-- 
The rsync repository.