VERSION is now defined in configure.in (as in all "right" programs
including GNOME). Definition in Make.common.in is removed. File "VERSION" is still needed for the PC port. acconfig.h doesn't include "VERSION" anymore config.h.in is rebuild using autoheader
Этот коммит содержится в:
родитель
77c27f6130
Коммит
034919825e
@ -1,4 +1,4 @@
|
||||
VERSION=pre.1.5
|
||||
VERSION = @VERSION@
|
||||
|
||||
SHELL = /bin/sh
|
||||
|
||||
|
@ -20,11 +20,10 @@
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
|
||||
|
||||
#include <VERSION>
|
||||
|
||||
|
||||
@TOP@
|
||||
|
||||
#undef VERSION
|
||||
#undef PACKAGE
|
||||
|
||||
/* Always defined */
|
||||
|
@ -21,8 +21,6 @@
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
|
||||
|
||||
#include <VERSION>
|
||||
|
||||
|
||||
|
||||
/* Define if on AIX 3.
|
||||
@ -118,6 +116,7 @@
|
||||
/* Define if the X Window System is missing or not being used. */
|
||||
#undef X_DISPLAY_MISSING
|
||||
|
||||
#undef VERSION
|
||||
#undef PACKAGE
|
||||
|
||||
/* Always defined */
|
||||
|
@ -5,9 +5,10 @@ AC_INIT(create_vcs)
|
||||
AC_CONFIG_HEADER(config.h)
|
||||
|
||||
PACKAGE=mc
|
||||
VERSION=dummy
|
||||
VERSION=4.1.35
|
||||
AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
|
||||
AC_DEFINE_UNQUOTED(VERSION, "dummy")
|
||||
AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
|
||||
AC_SUBST(VERSION)
|
||||
|
||||
dnl This is path where we're looking for headers in addition to /usr/include
|
||||
dnl and whatever cpp defaults to.
|
||||
@ -1412,6 +1413,7 @@ dnl
|
||||
AC_OUTPUT([
|
||||
Make.common
|
||||
Makefile
|
||||
VERSION
|
||||
doc/Makefile
|
||||
vfs/Makefile:vfs/Make-mc.in
|
||||
lib/Makefile
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user