mirror of
https://github.com/MidnightCommander/mc
synced 2024-12-22 20:36:50 +03:00
Ticket #4249: Autoreconf is failing with tarball prepared by make dist.
version.sh: move from maint/utils to the root of the source tree and make it a part of distributable tarball. Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
parent
1a1c6cc278
commit
791acb4611
10
Makefile.am
10
Makefile.am
@ -9,7 +9,9 @@ endif
|
|||||||
|
|
||||||
EXTRA_DIST =
|
EXTRA_DIST =
|
||||||
|
|
||||||
dist_noinst_SCRIPTS = build-glib2.sh
|
dist_noinst_SCRIPTS = \
|
||||||
|
build-glib2.sh \
|
||||||
|
version.sh
|
||||||
|
|
||||||
dist_noinst_HEADERS = $(top_srcdir)/mc-version.h
|
dist_noinst_HEADERS = $(top_srcdir)/mc-version.h
|
||||||
|
|
||||||
@ -29,11 +31,11 @@ CONFIG_STATUS_DEPENDENCIES = $(top_srcdir)/mc-version.h
|
|||||||
|
|
||||||
|
|
||||||
update-version:
|
update-version:
|
||||||
@if test -x $(top_srcdir)/maint/utils/version.sh; then \
|
@if test -x $(top_srcdir)/version.sh; then \
|
||||||
$(top_srcdir)/maint/utils/version.sh "$(top_srcdir)" 2>&1 >/dev/null; \
|
$(top_srcdir)/version.sh "$(top_srcdir)" 2>&1 >/dev/null; \
|
||||||
else \
|
else \
|
||||||
if test ! -e $(top_srcdir)/mc-version.h; then \
|
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; \
|
exit 1; \
|
||||||
fi; \
|
fi; \
|
||||||
fi
|
fi
|
||||||
|
@ -20,7 +20,7 @@ ${XGETTEXT:-xgettext} --keyword=_ --keyword=N_ --keyword=Q_ --output=- \
|
|||||||
cd src/vfs/smbfs/helpers
|
cd src/vfs/smbfs/helpers
|
||||||
date -u >include/stamp-h.in
|
date -u >include/stamp-h.in
|
||||||
|
|
||||||
$srcdir/maint/utils/version.sh "$srcdir"
|
$srcdir/version.sh "$srcdir"
|
||||||
|
|
||||||
if test -x $srcdir/configure.mc; then
|
if test -x $srcdir/configure.mc; then
|
||||||
$srcdir/configure.mc "$@"
|
$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.
|
dnl As a result, config.h will not contain macros with variable version.
|
||||||
m4_define([AC_PACKAGE_VERSION], [])
|
m4_define([AC_PACKAGE_VERSION], [])
|
||||||
m4_define([AC_PACKAGE_STRING], [])
|
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/wiki/NewTicket], [mc],
|
||||||
[https://www.midnight-commander.org/])
|
[https://www.midnight-commander.org/])
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user