I just tried to run "make distcheck" and discovered that the make dist
target are not able to create the tar files due to too long file
paths. (limit of 99 char).
To rectify this the paramter "tar-ustar" is required to as a automake
option... This option is not settable through AUTOMAKE_OPTIONS in
common.am, but must be set in the call to AM_INIT_AUTOMAKE. So I did
that.
I did some other related stuff as well. I belive that this does not
change the packaging at all.
This is going in soon.
Index: autogen.sh
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/autogen.sh,v
retrieving revision 1.60
diff -u -p -r1.60 autogen.sh
--- autogen.sh 16 Jul 2005 15:15:16 -0000 1.60
+++ autogen.sh 18 Dec 2005 17:55:47 -0000
@@ -2,7 +2,7 @@
ACLOCAL="aclocal -I ${PWD}/m4"
AUTOHEADER="autoheader"
-AUTOMAKE="automake -a -c --foreign"
+AUTOMAKE="automake --add-missing --copy --force-missing --foreign"
AUTOCONF="autoconf"
ACINCLUDE_FILES="lyxinclude.m4 libtool.m4 xforms.m4 qt.m4 gtk--.m4 gnome--.m4 gnome.m4 spell.m4 cygwin.m4 pkg.m4"
Index: configure.ac
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/configure.ac,v
retrieving revision 1.68
diff -u -p -r1.68 configure.ac
--- configure.ac 9 Dec 2005 13:42:22 -0000 1.68
+++ configure.ac 18 Dec 2005 17:55:47 -0000
@@ -1,16 +1,16 @@
dnl Process with autoconf to generate configure script -*- sh -*-
-AC_INIT(lyx,1.4.0cvs,lyx-devel@lists.lyx.org)
+AC_INIT(LyX,1.4.0cvs,[EMAIL PROTECTED],[lyx])
AC_PREREQ(2.52)
AC_CONFIG_SRCDIR(src/main.C)
-AM_CONFIG_HEADER([src/config.h])
+AC_CONFIG_HEADERS([src/config.h])
AC_CONFIG_AUX_DIR(config)
-# first the version
-VERSION="1.4.0cvs"
+# First check the version
LYX_CHECK_VERSION
AC_CANONICAL_TARGET
+
# Check how the files should be packaged
LYX_USE_PACKAGING
LYX_VERSION_SUFFIX
@@ -21,7 +21,7 @@ if test "${enable_maintainer_mode+set}"
fi
AM_MAINTAINER_MODE
-AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
+AM_INIT_AUTOMAKE([foreign dist-bzip2 tar-ustar])
### Set the execute permissions of the various scripts correctly
for file in config/install-sh config/mkinstalldirs lib/configure ; do
Index: config/common.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/config/common.am,v
retrieving revision 1.16
diff -u -p -r1.16 common.am
--- config/common.am 18 Jul 2005 17:10:34 -0000 1.16
+++ config/common.am 18 Dec 2005 17:55:47 -0000
@@ -1,5 +1,3 @@
-AUTOMAKE_OPTIONS = foreign dist-bzip2
-
CLEANFILES = pch.h.gch
DISTCLEANFILES= pch.h.gch.dep *.orig *.rej *~ *.bak core
Index: config/lyxinclude.m4
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/config/lyxinclude.m4,v
retrieving revision 1.117
diff -u -p -r1.117 lyxinclude.m4
--- config/lyxinclude.m4 13 Oct 2005 14:45:12 -0000 1.117
+++ config/lyxinclude.m4 18 Dec 2005 17:55:47 -0000
@@ -8,14 +8,14 @@ dnl Usage LYX_CHECK_VERSION Displays v
dnl sets variables "lyx_devel_version" and "lyx_prerelease"
AC_DEFUN([LYX_CHECK_VERSION],[
echo "configuring LyX version $VERSION"
-if echo "$VERSION" | grep 'cvs' >/dev/null ; then
+if echo AC_PACKAGE_VERSION | grep 'cvs' >/dev/null ; then
lyx_devel_version=yes
AC_DEFINE(DEVEL_VERSION, 1, [Define if you are building a development version of LyX])
echo "WARNING: This is a development version. Expect bugs."
else
lyx_devel_version=no
fi
-if echo "$VERSION" | grep 'pre' > /dev/null ; then
+if echo AC_PACKAGE_VERSION | grep 'pre' > /dev/null ; then
lyx_prerelease=yes
echo "WARNING: This is a prerelease. Be careful and backup your documents."
else
--
Lgb
