* Makefile.am (install-exec-hook): Use APIVERSION.

	* m4/init.m4 (AM_INIT_AUTOMAKE): Use am__api_version.
	* m4/amversion.in (AM_AUTOMAKE_VERSION): Set am__api_version from
	APIVERSION.
	* automake.in (perllibdir): Use APIVERSION.
	(libdir): Likewise.
	* aclocal.in (perllibdir): Use APIVERSION.
	(APIVERSION): New global.
	(parse_arguments): Use APIVERSION.
	* configure.in (APIVERSION): New subst.
	(pkgvdatadir): Use APIVERSION.

diff --git a/ChangeLog b/ChangeLog
index defcdf618e78566a63253edb69ccc642a9b9921a..05756e4a0ae200530f785d54bab1dc6b1d9a4ede 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2002-01-16  Tom Tromey  <tromey@redhat.com>
+
+       * Makefile.am (install-exec-hook): Use APIVERSION.
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Use am__api_version.
+       * m4/amversion.in (AM_AUTOMAKE_VERSION): Set am__api_version from
+       APIVERSION.
+       * automake.in (perllibdir): Use APIVERSION.
+       (libdir): Likewise.
+       * aclocal.in (perllibdir): Use APIVERSION.
+       (APIVERSION): New global.
+       (parse_arguments): Use APIVERSION.
+       * configure.in (APIVERSION): New subst.
+       (pkgvdatadir): Use APIVERSION.
+
 2002-01-15  Tom Tromey  <tromey@redhat.com>
 
        * missing: Updated.

diff --git a/Makefile.am b/Makefile.am
index 7bbd023784bde3c687f49a805976b08aef257446..fea9ad210b060af26032dba927e638e36e71ac3c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,7 +43,7 @@ install-exec-hook:
        @$(POST_INSTALL)
        @for p in $(bin_SCRIPTS); do \
          f="`echo $$p|sed '$(transform)'`"; \
-         fv="$$f-$(VERSION)"; \
+         fv="$$f-$(APIVERSION)"; \
          rm -f $(DESTDIR)$(bindir)/$$fv; \
          echo " ln $(DESTDIR)$(bindir)/$$f $(DESTDIR)$(bindir)/$$fv"; \
          ln $(DESTDIR)$(bindir)/$$f $(DESTDIR)$(bindir)/$$fv; \

diff --git a/Makefile.in b/Makefile.in
index c7baf24d94ed8c626b89840206281eabd08eb25b..f8101f57fc7f6c507d3e2142967612f92cb49e35 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -62,6 +62,7 @@ EXEEXT = @EXEEXT@
 OBJEXT = @OBJEXT@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
+APIVERSION = @APIVERSION@
 AWK = @AWK@
 DEPDIR = @DEPDIR@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -567,7 +568,7 @@ install-exec-hook:
        @$(POST_INSTALL)
        @for p in $(bin_SCRIPTS); do \
          f="`echo $$p|sed '$(transform)'`"; \
-         fv="$$f-$(VERSION)"; \
+         fv="$$f-$(APIVERSION)"; \
          rm -f $(DESTDIR)$(bindir)/$$fv; \
          echo " ln $(DESTDIR)$(bindir)/$$f $(DESTDIR)$(bindir)/$$fv"; \
          ln $(DESTDIR)$(bindir)/$$f $(DESTDIR)$(bindir)/$$fv; \

diff --git a/aclocal.in b/aclocal.in
index 941c141245524e3b934c4b1e1a5c036b0f8036b5..34bc04e28cfca2d73870ab5dc0b0ff329f01d034 100644 (file)
--- a/aclocal.in
+++ b/aclocal.in
@@ -28,7 +28,7 @@ eval 'exec @PERL@ -S $0 ${1+"$@"}'
 BEGIN
 {
   my $prefix = "@prefix@";
-  my $perllibdir = $ENV{'perllibdir'} || "@datadir@/@PACKAGE@-@VERSION@";
+  my $perllibdir = $ENV{'perllibdir'} || "@datadir@/@PACKAGE@-@APIVERSION@";
   unshift @INC, "$perllibdir";
 }
 
@@ -37,6 +37,7 @@ use Automake::XFile;
 
 # Some constants.
 $VERSION = "@VERSION@";
+$APIVERSION = "@APIVERSION@";
 $PACKAGE = "@PACKAGE@";
 $prefix = "@prefix@";
 # Note that this isn't pkgdatadir, but a separate directory.
@@ -215,7 +216,7 @@ sub parse_arguments
     # Search the versioned directory near the end, and then the
     # unversioned directory last.  Only do this if the user didn't
     # override acdir.
-    push (@dirlist, "$acdir-$VERSION")
+    push (@dirlist, "$acdir-$APIVERSION")
        if $acdir eq $default_acdir;
 
     # By default $(datadir)/aclocal doesn't exist.  We don't want to

diff --git a/aclocal.m4 b/aclocal.m4
index 925858bf812ca2f9b7ece62ea29f8a1d5c6f4303..a210bb7dcb9bcf0b5ca5acd0de8a7741aae2592a 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -88,7 +88,7 @@ AC_REQUIRE([AM_SANITY_CHECK])dnl
 AC_REQUIRE([AC_ARG_PROGRAM])dnl
 AM_MISSING_PROG(ACLOCAL, aclocal)
 AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, "automake-${am__version}")
+AM_MISSING_PROG(AUTOMAKE, "automake-${am__api_version}")
 AM_MISSING_PROG(AUTOHEADER, autoheader)
 AM_MISSING_PROG(MAKEINFO, makeinfo)
 AM_MISSING_PROG(AMTAR, tar)
@@ -130,7 +130,7 @@ AC_PROVIDE_IFELSE([AC_PROG_][CXX],
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__version="$1"])
+AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.5c"])
 
 # AM_SET_CURRENT_AUTOMAKE_VERSION
 # -------------------------------

diff --git a/automake.in b/automake.in
index 5f95f6e26eda4be7fda75c78291a43ae385dbf6d..7d7c456a096db325223396342eba33e006c442c3 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -32,7 +32,7 @@ package Language;
 BEGIN
 {
   my $prefix = "@prefix@";
-  my $perllibdir = $ENV{'perllibdir'} || "@datadir@/@PACKAGE@-@VERSION@";
+  my $perllibdir = $ENV{'perllibdir'} || "@datadir@/@PACKAGE@-@APIVERSION@";
   unshift @INC, "$perllibdir";
 }
 
@@ -125,7 +125,7 @@ use Carp;
 my $VERSION = "@VERSION@";
 my $PACKAGE = "@PACKAGE@";
 my $prefix = "@prefix@";
-my $libdir = "@datadir@/@PACKAGE@-@VERSION@";
+my $libdir = "@datadir@/@PACKAGE@-@APIVERSION@";
 
 # String constants.
 my $IGNORE_PATTERN = '^\s*##([^#\n].*)?\n';

diff --git a/configure b/configure
index ddc500f855d646587c072d19b266ac66e81e9112..8296c3cb7dcd06bc9f9df89c5b7fc0947e702162 100755 (executable)
--- a/configure
+++ b/configure
@@ -1160,7 +1160,7 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub"
 ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
 
-am__version="1.5c"
+am__api_version="1.5c"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -1441,7 +1441,7 @@ ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal"}
 AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
 
 
-AUTOMAKE=${AUTOMAKE-"${am_missing_run}"automake-${am__version}""}
+AUTOMAKE=${AUTOMAKE-"${am_missing_run}"automake-${am__api_version}""}
 
 
 AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
@@ -1460,8 +1460,13 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
 # some platforms.
 
 
+# The API version is the base version.  We must guarantee
+# compatibility for all releases with the same API version.
+APIVERSION=`echo "$VERSION" | sed -e 's/^\([0-9]*\.[0-9]*\).*$/\1/'`
+
+
 # A versioned directory, defined here for convenience.
-pkgvdatadir="\${datadir}/automake-${VERSION}"
+pkgvdatadir="\${datadir}/automake-${APIVERSION}"
 
 
 # $AUTOMAKE and $ACLOCAL are always run after a `cd $top_srcdir',
@@ -2155,6 +2160,7 @@ s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
 s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
 s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
 s,@DEPDIR@,$DEPDIR,;t t
+s,@APIVERSION@,$APIVERSION,;t t
 s,@pkgvdatadir@,$pkgvdatadir,;t t
 s,@PERL@,$PERL,;t t
 CEOF

diff --git a/configure.in b/configure.in
index 045fbf8b3419513d042d1c66010b1814b9cae644..e2205cf44052fcfa1abad13dd9b7eb6c3f24b255 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -26,8 +26,13 @@ AC_CONFIG_AUX_DIR(lib)
 
 AM_INIT_AUTOMAKE([1.5 dist-bzip2])
 
+# The API version is the base version.  We must guarantee
+# compatibility for all releases with the same API version.
+APIVERSION=`echo "$VERSION" | sed -e 's/^\([[0-9]]*\.[[0-9]]*\).*$/\1/'`
+AC_SUBST(APIVERSION)
+
 # A versioned directory, defined here for convenience.
-pkgvdatadir="\${datadir}/automake-${VERSION}"
+pkgvdatadir="\${datadir}/automake-${APIVERSION}"
 AC_SUBST(pkgvdatadir)
 
 # $AUTOMAKE and $ACLOCAL are always run after a `cd $top_srcdir',

diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in
index 3a2ea8a143f256f3451094561772d05a8dba043c..6c73ccc5bafe41bb40b8f094b28423b8b87a8f3c 100644 (file)
--- a/lib/Automake/Makefile.in
+++ b/lib/Automake/Makefile.in
@@ -62,6 +62,7 @@ EXEEXT = @EXEEXT@
 OBJEXT = @OBJEXT@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
+APIVERSION = @APIVERSION@
 AWK = @AWK@
 DEPDIR = @DEPDIR@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

diff --git a/lib/Makefile.in b/lib/Makefile.in
index a670f3f144030ec1472d407b392f4c064e130d34..f20e730fc6f6b18777869eada388aeeca5b5690a 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -62,6 +62,7 @@ EXEEXT = @EXEEXT@
 OBJEXT = @OBJEXT@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
+APIVERSION = @APIVERSION@
 AWK = @AWK@
 DEPDIR = @DEPDIR@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in
index e48c2d666f780af99aa06b51ed79d603a2ba5b4b..9ebeef65594c4cad9914776f1df356aefb4067c5 100644 (file)
--- a/lib/am/Makefile.in
+++ b/lib/am/Makefile.in
@@ -62,6 +62,7 @@ EXEEXT = @EXEEXT@
 OBJEXT = @OBJEXT@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
+APIVERSION = @APIVERSION@
 AWK = @AWK@
 DEPDIR = @DEPDIR@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

diff --git a/m4/Makefile.in b/m4/Makefile.in
index bc3e6262743a12e55a53ff6d107b896aabfffbcd..38f4ecbbee6ee4de62dd2c81a54f279196a1d5e7 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -62,6 +62,7 @@ EXEEXT = @EXEEXT@
 OBJEXT = @OBJEXT@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
+APIVERSION = @APIVERSION@
 AWK = @AWK@
 DEPDIR = @DEPDIR@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

diff --git a/m4/amversion.in b/m4/amversion.in
index e7b900b291915e4596a1fc7c5a6cf496d73e879a..ef572f27261f4fcc294a0c4b54eb7a018e892bc8 100644 (file)
--- a/m4/amversion.in
+++ b/m4/amversion.in
@@ -18,7 +18,7 @@
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__version="$1"])
+AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="@APIVERSION@"])
 
 # AM_SET_CURRENT_AUTOMAKE_VERSION
 # -------------------------------

diff --git a/m4/init.m4 b/m4/init.m4
index 1b1df79e1a5182276df3118a0832430fad9818dc..2d36689449066e628044b34eb22dff6dac2c19c3 100644 (file)
--- a/m4/init.m4
+++ b/m4/init.m4
@@ -75,7 +75,7 @@ AC_REQUIRE([AM_SANITY_CHECK])dnl
 AC_REQUIRE([AC_ARG_PROGRAM])dnl
 AM_MISSING_PROG(ACLOCAL, aclocal)
 AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, "automake-${am__version}")
+AM_MISSING_PROG(AUTOMAKE, "automake-${am__api_version}")
 AM_MISSING_PROG(AUTOHEADER, autoheader)
 AM_MISSING_PROG(MAKEINFO, makeinfo)
 AM_MISSING_PROG(AMTAR, tar)

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 76c9a25bbdff4dec30a2a353b3f182dcd36d3707..41e745bb15105407401ec1ed24f669a9abb912cf 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -62,6 +62,7 @@ EXEEXT = @EXEEXT@
 OBJEXT = @OBJEXT@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
+APIVERSION = @APIVERSION@
 AWK = @AWK@
 DEPDIR = @DEPDIR@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@