Browse Source

Rename version.h to mc-version.h.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Andrew Borodin 4 years ago
parent
commit
30480df7c9
4 changed files with 9 additions and 9 deletions
  1. 4 4
      Makefile.am
  2. 1 1
      lib/global.c
  3. 3 3
      m4.include/mc-version.m4
  4. 1 1
      maint/utils/version.sh

+ 4 - 4
Makefile.am

@@ -11,11 +11,11 @@ EXTRA_DIST =
 
 dist_noinst_SCRIPTS = build-glib2.sh
 
-dist_noinst_HEADERS = $(top_srcdir)/version.h
+dist_noinst_HEADERS = $(top_srcdir)/mc-version.h
 
 ACLOCAL_AMFLAGS = -I m4
 
-CONFIG_STATUS_DEPENDENCIES = $(top_srcdir)/version.h
+CONFIG_STATUS_DEPENDENCIES = $(top_srcdir)/mc-version.h
 
 .PHONY: update-version \
         cppcheck \
@@ -32,13 +32,13 @@ update-version:
 	@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 \
+	    if test ! -e $(top_srcdir)/mc-version.h; then \
 	        echo "File not found: $(top_srcdir)/maint/utils/version.sh"; \
 	        exit 1; \
 	    fi; \
 	fi
 
-$(top_srcdir)/version.h: update-version
+$(top_srcdir)/mc-version.h: update-version
 
 CPPCHECK_CMD = cppcheck \
     --inline-suppr \

+ 1 - 1
lib/global.c

@@ -30,7 +30,7 @@
 
 #include <config.h>
 
-#include "version.h"
+#include "mc-version.h"
 
 #include "global.h"
 

+ 3 - 3
m4.include/mc-version.m4

@@ -3,14 +3,14 @@ dnl
 dnl Get current version of Midnight Commander from git tags
 dnl
 dnl @author Slava Zanko <slavazanko@gmail.com>
-dnl @version 2021-03-20
+dnl @version 2021-03-28
 dnl @license GPL
 dnl @copyright Free Software Foundation, Inc.
 dnl @modified Andrew Borodin <aborodin@vmail.ru>
 
 AC_DEFUN([mc_VERSION],[
-    if test -f ${srcdir}/version.h; then
-        VERSION=$(grep '^#define MC_CURRENT_VERSION' ${srcdir}/version.h | sed 's/.*"\(.*\)"$/\1/')
+    if test -f ${srcdir}/mc-version.h; then
+        VERSION=$(grep '^#define MC_CURRENT_VERSION' ${srcdir}/mc-version.h | sed 's/.*"\(.*\)"$/\1/')
     else
         VERSION="unknown"
     fi

+ 1 - 1
maint/utils/version.sh

@@ -56,7 +56,7 @@ fi
 
 src_top_dir="$1"
 
-VERSION_FILE="${src_top_dir}/version.h"
+VERSION_FILE="${src_top_dir}/mc-version.h"
 PREV_MC_VERSION="unknown"
 CURR_MC_VERSION="${PREV_MC_VERSION}"