Reorder files in maint/ subdirectory.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>

Makefile.am

@@ -20,11 +20,11 @@ CONFIG_STATUS_DEPENDENCIES = $(top_srcdir)/version.h
 .PHONY: update-version
 
 update-version:
-	@if test -x $(top_srcdir)/maint/version.sh; then \
-	    $(top_srcdir)/maint/version.sh "$(top_srcdir)" 2>&1 >/dev/null; \
+	@if test -x $(top_srcdir)/maint/utils/version.sh; then \
+	    $(top_srcdir)/maint/utils/version.sh "$(top_srcdir)" 2>&1 >/dev/null; \
 	else \
 	    if test ! -e $(top_srcdir)/version.h; then \
-	        echo "File not found: $(top_srcdir)/maint/version.sh"; \
+	        echo "File not found: $(top_srcdir)/maint/utils/version.sh"; \
 	        exit 1; \
 	    fi; \
 	fi

autogen.sh

@@ -23,7 +23,7 @@ set -e
 
 $AUTOPOINT --version >/dev/null 2>&1
 if test $? -ne 0;  then
-    AUTOPOINT=maint/autopoint
+    AUTOPOINT=maint/utils/autopoint
 fi
 
 cd "$srcdir"
@@ -84,7 +84,7 @@ test -f configure || \
   { echo "autoconf failed to generate src/vfs/smbfs/helpers/configure" >&2; exit 1; }
 ) || exit 1
 
-$srcdir/maint/version.sh "$srcdir"
+$srcdir/maint/utils/version.sh "$srcdir"
 
 if test -x $srcdir/configure.mc; then
   $srcdir/configure.mc "$@"

m4.include/mc-version.m4

@@ -9,7 +9,7 @@ dnl @copyright Free Software Foundation, Inc.
 
 AC_DEFUN([MC_VERSION],[
     if test ! -f ${srcdir}/version.h; then
-        ${srcdir}/maint/version.sh ${srcdir}
+        ${srcdir}/maint/utils/version.sh ${srcdir}
     fi
     if test -f ${srcdir}/version.h; then
         VERSION=$(grep '^#define MC_CURRENT_VERSION' ${srcdir}/version.h | sed 's/.*"\(.*\)"$/\1/')

maint/doctest → maint/utils/doctest

@@ -27,7 +27,7 @@
 
 #set -e
 
-MC_SOURCE_ROOT_DIR=${MC_SOURCE_ROOT_DIR:-$(dirname $(pwd))}
+MC_SOURCE_ROOT_DIR=${MC_SOURCE_ROOT_DIR:-$(dirname $(dirname $(pwd)))}
 
 #*** include section (source functions, for example) *******************
 

maint/find-dup-includes/runme.sh → maint/utils/find-dup-includes/runme.sh

@@ -27,7 +27,7 @@ set -e
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-MC_SOURCE_ROOT_DIR=${MC_SOURCE_ROOT_DIR:-$(dirname $(dirname $(pwd)))}
+MC_SOURCE_ROOT_DIR=${MC_SOURCE_ROOT_DIR:-$(dirname $(dirname $(dirname $(pwd))))}
 
 #*** include section (source functions, for example) *******************
 
@@ -38,8 +38,8 @@ findIncludeDupsInDir() {
 
     for i in $(find "${dir_name}" -name '*.[ch]'); do
         file_name=$(echo $i | sed 's@'"${MC_SOURCE_ROOT_DIR}/"'@@g')
-        [ $(grep "^\s*${file_name}$" -c "${MC_SOURCE_ROOT_DIR}/maint/find-dup-includes/exclude-list.cfg") -ne 0 ] && continue
-        "${MC_SOURCE_ROOT_DIR}/maint/find-dup-includes/find-in-one-file.pl" "${i}"
+        [ $(grep "^\s*${file_name}$" -c "${MC_SOURCE_ROOT_DIR}/maint/utils/find-dup-includes/exclude-list.cfg") -ne 0 ] && continue
+        "${MC_SOURCE_ROOT_DIR}/maint/utils/find-dup-includes/find-in-one-file.pl" "${i}"
     done
 }