mirror of https://github.com/MidnightCommander/mc
Merge branch '4249-version.sh'
* 4249-version.sh: Ticket #4249: Autoreconf is failing with tarball prepared by make dist.
This commit is contained in:
commit
e4195219fd
10
Makefile.am
10
Makefile.am
|
@ -9,7 +9,9 @@ endif
|
|||
|
||||
EXTRA_DIST =
|
||||
|
||||
dist_noinst_SCRIPTS = build-glib2.sh
|
||||
dist_noinst_SCRIPTS = \
|
||||
build-glib2.sh \
|
||||
version.sh
|
||||
|
||||
dist_noinst_HEADERS = $(top_srcdir)/mc-version.h
|
||||
|
||||
|
@ -29,11 +31,11 @@ CONFIG_STATUS_DEPENDENCIES = $(top_srcdir)/mc-version.h
|
|||
|
||||
|
||||
update-version:
|
||||
@if test -x $(top_srcdir)/maint/utils/version.sh; then \
|
||||
$(top_srcdir)/maint/utils/version.sh "$(top_srcdir)" 2>&1 >/dev/null; \
|
||||
@if test -x $(top_srcdir)/version.sh; then \
|
||||
$(top_srcdir)/version.sh "$(top_srcdir)" 2>&1 >/dev/null; \
|
||||
else \
|
||||
if test ! -e $(top_srcdir)/mc-version.h; then \
|
||||
echo "File not found: $(top_srcdir)/maint/utils/version.sh"; \
|
||||
echo "File not found: $(top_srcdir)/version.sh"; \
|
||||
exit 1; \
|
||||
fi; \
|
||||
fi
|
||||
|
|
|
@ -20,7 +20,7 @@ ${XGETTEXT:-xgettext} --keyword=_ --keyword=N_ --keyword=Q_ --output=- \
|
|||
cd src/vfs/smbfs/helpers
|
||||
date -u >include/stamp-h.in
|
||||
|
||||
$srcdir/maint/utils/version.sh "$srcdir"
|
||||
$srcdir/version.sh "$srcdir"
|
||||
|
||||
if test -x $srcdir/configure.mc; then
|
||||
$srcdir/configure.mc "$@"
|
||||
|
|
|
@ -17,7 +17,7 @@ dnl AC_INIT call, AC_INIT doesn't redefine them.
|
|||
dnl As a result, config.h will not contain macros with variable version.
|
||||
m4_define([AC_PACKAGE_VERSION], [])
|
||||
m4_define([AC_PACKAGE_STRING], [])
|
||||
AC_INIT([GNU Midnight Commander], m4_esyscmd_s([maint/utils/version.sh .]),
|
||||
AC_INIT([GNU Midnight Commander], m4_esyscmd_s([./version.sh .]),
|
||||
[https://www.midnight-commander.org/wiki/NewTicket], [mc],
|
||||
[https://www.midnight-commander.org/])
|
||||
|
||||
|
|
Loading…
Reference in New Issue