From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Thu, 10 Jan 2013 22:40:26 +0000 (+0100)
Subject: Rename 'maint/' -> 'maintainer/', for Git's sake
X-Git-Tag: v1.13b~119
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dbe3eea4d5b65f998c57a571c034c6044f2bd1e2;p=thirdparty%2Fautomake.git

Rename 'maint/' -> 'maintainer/', for Git's sake

Otherwise, Git gets confused by the fact that a directory ('maint')
is named like a branch, and forces me to tweak the command line to
resolve the ambiguity for it.

* maint/: Rename ...
* maintainer/: ... like this.
* Makefile.am, GNUmakefile: Adjust.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

diff --git a/GNUmakefile b/GNUmakefile
index d6baaaa7b..c6f460cd4 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -25,8 +25,8 @@ ifeq ($(wildcard Makefile),)
   $(error Fatal Error)
 endif
 include ./Makefile
-include $(srcdir)/maint/maint.mk
-include $(srcdir)/maint/syntax-checks.mk
+include $(srcdir)/maintainer/maint.mk
+include $(srcdir)/maintainer/syntax-checks.mk
 
 else # ! bootstrap in $(MAKECMDGOALS)
 
diff --git a/Makefile.am b/Makefile.am
index 3c40f27cb..ab98df708 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -116,7 +116,7 @@ maintainer-clean-local:
 	rm -rf .autom4te.cache
 
 # So that automake won't complain about the missing ChangeLog.
-# The real rule for ChangeLog generation is now in main/maint.mk
+# The real rule for ChangeLog generation is now in maintainer/maint.mk
 # (as it is maintainer-specific).
 ChangeLog:
 
@@ -684,8 +684,8 @@ EXTRA_DIST += \
 ## ---------------------------------------- ##
   
 EXTRA_DIST += \
-  maint/am-ft \
-  maint/am-xft \
-  maint/rename-tests \
-  maint/maint.mk \
-  maint/syntax-checks.mk
+  maintainer/am-ft \
+  maintainer/am-xft \
+  maintainer/rename-tests \
+  maintainer/maint.mk \
+  maintainer/syntax-checks.mk
diff --git a/maint/am-ft b/maintainer/am-ft
similarity index 100%
rename from maint/am-ft
rename to maintainer/am-ft
diff --git a/maint/am-xft b/maintainer/am-xft
similarity index 100%
rename from maint/am-xft
rename to maintainer/am-xft
diff --git a/maint/maint.mk b/maintainer/maint.mk
similarity index 100%
rename from maint/maint.mk
rename to maintainer/maint.mk
diff --git a/maint/rename-tests b/maintainer/rename-tests
similarity index 100%
rename from maint/rename-tests
rename to maintainer/rename-tests
diff --git a/maint/syntax-checks.mk b/maintainer/syntax-checks.mk
similarity index 100%
rename from maint/syntax-checks.mk
rename to maintainer/syntax-checks.mk