From: Tom Tromey Date: Wed, 16 Jan 2002 19:05:47 +0000 (+0000) Subject: * Makefile.am (install-exec-hook): Use APIVERSION. X-Git-Tag: Release-1-5d~30 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b85334eb7576252be6de85530112628e9262041d;p=thirdparty%2Fautomake.git * 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 defcdf618..05756e4a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2002-01-16 Tom Tromey + + * 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 * missing: Updated. diff --git a/Makefile.am b/Makefile.am index 7bbd02378..fea9ad210 100644 --- 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 c7baf24d9..f8101f57f 100644 --- 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 941c14124..34bc04e28 100644 --- 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 925858bf8..a210bb7dc 100644 --- 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 5f95f6e26..7d7c456a0 100755 --- 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 ddc500f85..8296c3cb7 100755 --- 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 045fbf8b3..e2205cf44 100644 --- 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 3a2ea8a14..6c73ccc5b 100644 --- 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 a670f3f14..f20e730fc 100644 --- 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 e48c2d666..9ebeef655 100644 --- 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 bc3e62627..38f4ecbbe 100644 --- 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 e7b900b29..ef572f272 100644 --- 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 1b1df79e1..2d3668944 100644 --- 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 76c9a25bb..41e745bb1 100644 --- 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@