From a2f733c664c977a79a91f4e63b5eacff642f4370 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tiziano=20M=C3=BCller?= <tiziano.mueller@stepping-stone.ch>
Date: Wed, 8 Apr 2015 13:29:33 +0200
Subject: [PATCH] Rename aclocal.m4 to acinclude.m4 and add make target

It is common practice to split up m4 files for easier maintenance and
generate the required aclocal.m4 using `aclocal` instead.
---
 .gitignore                 | 1 +
 Makefile.in                | 3 +++
 aclocal.m4 => acinclude.m4 | 0
 prepare-source.mak         | 3 +++
 4 files changed, 7 insertions(+)
 rename aclocal.m4 => acinclude.m4 (100%)

diff --git a/.gitignore b/.gitignore
index 948d3f7f..23bd4d7b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ config.h.in
 config.h.in.old
 config.log
 config.status
+aclocal.m4
 /proto.h
 /proto.h-tstamp
 /rsync.1
diff --git a/Makefile.in b/Makefile.in
index d0e0dded..a5ea668c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -143,6 +143,9 @@ gensend: gen
 conf:
 	cd $(srcdir) && $(MAKE) -f prepare-source.mak conf
 
+aclocal.m4: acinclude.m4
+	aclocal
+
 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
 	@if test -f config.h.in; then cp -p config.h.in config.h.in.old; else touch config.h.in.old; fi
diff --git a/aclocal.m4 b/acinclude.m4
similarity index 100%
rename from aclocal.m4
rename to acinclude.m4
diff --git a/prepare-source.mak b/prepare-source.mak
index 054bab70..efb62283 100644
--- a/prepare-source.mak
+++ b/prepare-source.mak
@@ -1,5 +1,8 @@
 conf: configure.sh config.h.in
 
+aclocal.m4:
+	aclocal
+
 configure.sh: configure.ac aclocal.m4
 	autoconf -o configure.sh
 
-- 
2.47.2