Alexandre Duret-Lutz <[EMAIL PROTECTED]> writes:
> Havoc> in the spec file I rename automake to automake-1.4,
> Havoc> aclocal to aclocal-1.4, automake to automake-1.5,
> Havoc> aclocal to aclocal-1.5, and symlink automake to
> Havoc> automake-1.5.
>
> Doesn't `configure --program-suffix=-1.5' work? (To rename the
> binaries, I mean. The directories still need to be renamed and
> I hardly see why Automake could not install itself in
> $(datadir)/@PACKAGE@-@VERSION@.)
Yes.
> Would it be the job of `make install' to handle this symlink?
> If yes, how should it be updated? Say I install
> Automake-1.5 *after* Automake-1.6, should automake point to
> automake-1.5 or automake-1.6?
Well, I think it is easier to leave this to packagers, but
maybe it is a good idea to handle it.
> Havoc> + ## put in -I /usr/share/aclocal always
> Havoc> + push (@dirlist, "@datadir@/aclocal");
> Havoc> +
> Havoc> while (@arglist)
> Havoc> {
> Havoc> if ($arglist[0] =~ /^--acdir=(.+)$/)
>
> It seems you'd better move that `push' after the `while' loop,
> otherwise the files in @datadir@/aclocal will override the user
> files (the converse is expected).
I think the patch below handles the versioning issue a
little more cleanly. If it seems ok, I'll submit it to
automake-patches with a changelog entries. Some people may
frown at the adding of the version to the package-name...
Jens
ps I don't think the docs need to be changed wrt to
datadir/aclocal, or what do people think.
diff -ur automake-1.5.orig/aclocal.in automake-1.5/aclocal.in
--- automake-1.5.orig/aclocal.in Tue Jul 17 14:36:23 2001
+++ automake-1.5/aclocal.in Tue Jan 15 18:01:27 2002
@@ -32,7 +32,7 @@
$PACKAGE = "@PACKAGE@";
$prefix = "@prefix@";
# Note that this isn't pkgdatadir, but a separate directory.
-$acdir = "@datadir@/aclocal";
+$acdir = "@datadir@/aclocal-@VERSION@";
# Some globals.
@@ -200,6 +200,9 @@
shift (@arglist);
}
+ ## include also /usr/share/aclocal
+ push (@dirlist, "@datadir@/aclocal");
+
if ($print_and_exit)
{
print $acdir, "\n";
diff -ur automake-1.5.orig/configure.in automake-1.5/configure.in
--- automake-1.5.orig/configure.in Thu Aug 23 14:47:12 2001
+++ automake-1.5/configure.in Wed Jan 16 17:36:30 2002
@@ -3,7 +3,7 @@
AC_CONFIG_AUX_DIR(lib)
-AM_INIT_AUTOMAKE(automake, 1.5)
+AM_INIT_AUTOMAKE(automake-1.5, 1.5)
ACLOCAL="`pwd`/aclocal --acdir=m4"
# $AUTOMAKE is always run after a `cd $top_srcdir', hence `.' is really
diff -ur automake-1.5.orig/m4/Makefile.am automake-1.5/m4/Makefile.am
--- automake-1.5.orig/m4/Makefile.am Fri Aug 3 17:28:20 2001
+++ automake-1.5/m4/Makefile.am Wed Jan 16 17:44:31 2002
@@ -1,6 +1,6 @@
## Process this file with automake to create Makefile.in
-m4datadir = $(datadir)/aclocal
+m4datadir = $(datadir)/aclocal-@VERSION@
m4data_DATA = as.m4 auxdir.m4 ccstdc.m4 cond.m4 depend.m4 depout.m4 \
dmalloc.m4 error.m4 gcj.m4 header.m4 init.m4 install-sh.m4 lex.m4 \
lispdir.m4 make.m4 maintainer.m4 minuso.m4 missing.m4 multi.m4 \
