On Friday 30 December 2005 00:02, Lars Gullik Bjønnes wrote:
> Ah... can you also try to move the LYX_USE_PACKAGING after the
> AM_INIT_AUTOMAKE?
Seems to work for me.
Georg
Index: ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/ChangeLog,v
retrieving revision 1.1040
diff -u -p -r1.1040 ChangeLog
--- ChangeLog 28 Dec 2005 10:47:00 -0000 1.1040
+++ ChangeLog 30 Dec 2005 00:16:38 -0000
@@ -1,3 +1,7 @@
+2005-12-29 Georg Baum <[EMAIL PROTECTED]>
+
+ * configure.ac: fix version-suffix
+
2005-12-28 Georg Baum <[EMAIL PROTECTED]>
* autogen.sh: require automake 1.9
Index: configure.ac
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/configure.ac,v
retrieving revision 1.72
diff -u -p -r1.72 configure.ac
--- configure.ac 28 Dec 2005 10:47:00 -0000 1.72
+++ configure.ac 30 Dec 2005 00:16:38 -0000
@@ -11,10 +11,6 @@ AC_CONFIG_AUX_DIR(config)
LYX_CHECK_VERSION
AC_CANONICAL_TARGET
-# Check how the files should be packaged
-LYX_USE_PACKAGING
-LYX_VERSION_SUFFIX
-
dnl default maintainer mode to true for development versions
if test "${enable_maintainer_mode+set}" != set; then
enable_maintainer_mode=$lyx_devel_version
@@ -23,6 +19,10 @@ AM_MAINTAINER_MODE
AM_INIT_AUTOMAKE([foreign dist-bzip2 tar-ustar 1.9])
+# Check how the files should be packaged
+LYX_USE_PACKAGING
+LYX_VERSION_SUFFIX
+
### Set the execute permissions of the various scripts correctly
for file in config/install-sh config/mkinstalldirs lib/configure ; do
chmod 755 ${srcdir}/${file}
