summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Lattarini <stefano.lattarini@gmail.com>2013-01-10 23:40:26 +0100
committerStefano Lattarini <stefano.lattarini@gmail.com>2013-01-10 23:40:26 +0100
commitdbe3eea4d5b65f998c57a571c034c6044f2bd1e2 (patch)
tree5beb701981312d60084f4a548476a83c6f0f07b6
parent0168562049b471e432863c4570da53995fb92f2d (diff)
downloadautomake-dbe3eea4d5b65f998c57a571c034c6044f2bd1e2.tar.gz
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>
-rw-r--r--GNUmakefile4
-rw-r--r--Makefile.am12
-rwxr-xr-xmaintainer/am-ft (renamed from maint/am-ft)0
-rwxr-xr-xmaintainer/am-xft (renamed from maint/am-xft)0
-rw-r--r--maintainer/maint.mk (renamed from maint/maint.mk)0
-rwxr-xr-xmaintainer/rename-tests (renamed from maint/rename-tests)0
-rw-r--r--maintainer/syntax-checks.mk (renamed from maint/syntax-checks.mk)0
7 files changed, 8 insertions, 8 deletions
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
index d8a2722be..d8a2722be 100755
--- a/maint/am-ft
+++ b/maintainer/am-ft
diff --git a/maint/am-xft b/maintainer/am-xft
index 564aa3b02..564aa3b02 100755
--- a/maint/am-xft
+++ b/maintainer/am-xft
diff --git a/maint/maint.mk b/maintainer/maint.mk
index 69b163048..69b163048 100644
--- a/maint/maint.mk
+++ b/maintainer/maint.mk
diff --git a/maint/rename-tests b/maintainer/rename-tests
index 6fce9fe84..6fce9fe84 100755
--- a/maint/rename-tests
+++ b/maintainer/rename-tests
diff --git a/maint/syntax-checks.mk b/maintainer/syntax-checks.mk
index 375738be9..375738be9 100644
--- a/maint/syntax-checks.mk
+++ b/maintainer/syntax-checks.mk