head	1.7;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.6
	OPENPKG_E1_MP:1.6
	OPENPKG_E1_MP_2_STABLE:1.5
	OPENPKG_E1_FP:1.5
	OPENPKG_2_STABLE_MP:1.6
	OPENPKG_2_STABLE_20061018:1.5
	OPENPKG_2_STABLE_20060622:1.5
	OPENPKG_2_STABLE:1.5.0.10
	OPENPKG_2_STABLE_BP:1.5
	OPENPKG_2_5_RELEASE:1.5
	OPENPKG_2_5_SOLID:1.5.0.8
	OPENPKG_2_5_SOLID_BP:1.5
	OPENPKG_2_4_RELEASE:1.5
	OPENPKG_2_4_SOLID:1.5.0.6
	OPENPKG_2_4_SOLID_BP:1.5
	OPENPKG_CW_FP:1.5
	OPENPKG_2_3_RELEASE:1.5
	OPENPKG_2_3_SOLID:1.5.0.4
	OPENPKG_2_3_SOLID_BP:1.5
	OPENPKG_2_2_RELEASE:1.5
	OPENPKG_2_2_SOLID:1.5.0.2
	OPENPKG_2_2_SOLID_BP:1.5
	OPENPKG_2_1_RELEASE:1.4
	OPENPKG_2_1_SOLID:1.4.0.2
	OPENPKG_2_1_SOLID_BP:1.4
	OPENPKG_2_0_RELEASE:1.2
	OPENPKG_2_0_SOLID:1.2.0.2
	OPENPKG_2_0_SOLID_BP:1.2;
locks; strict;
comment	@# @;


1.7
date	2009.05.28.20.51.29;	author rse;	state Exp;
branches;
next	1.6;
commitid	8Hot9bzHThqwjGPt;

1.6
date	2006.11.11.19.41.29;	author rse;	state Exp;
branches;
next	1.5;
commitid	v3XofJRBUUmUMhUr;

1.5
date	2004.08.12.07.38.49;	author tho;	state Exp;
branches
	1.5.10.1;
next	1.4;

1.4
date	2004.04.20.07.17.02;	author rse;	state Exp;
branches;
next	1.3;

1.3
date	2004.04.15.10.43.44;	author cs;	state Exp;
branches;
next	1.2;

1.2
date	2003.12.11.08.15.17;	author rse;	state Exp;
branches;
next	1.1;

1.1
date	2003.11.08.12.40.54;	author rse;	state Exp;
branches;
next	;

1.5.10.1
date	2007.01.14.21.56.01;	author thl;	state Exp;
branches;
next	;
commitid	CAZHOWY4XWAutw2s;


desc
@@


1.7
log
@upgrading package: automake 1.10 -> 1.11
@
text
@Index: Makefile.in
--- Makefile.in.orig	2009-05-17 15:43:45 +0200
+++ Makefile.in	2009-05-28 19:46:09 +0200
@@@@ -94,7 +94,7 @@@@
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
+distdir = $(PACKAGE)
 top_distdir = $(distdir)
 am__remove_distdir = \
   { test ! -d "$(distdir)" \
Index: aclocal.in
--- aclocal.in.orig	2009-05-17 15:30:14 +0200
+++ aclocal.in	2009-05-28 19:46:09 +0200
@@@@ -28,7 +28,7 @@@@
 
 BEGIN
 {
-  my $perllibdir = $ENV{'perllibdir'} || '@@datadir@@/@@PACKAGE@@-@@APIVERSION@@';
+  my $perllibdir = $ENV{'perllibdir'} || '@@datadir@@/@@PACKAGE@@';
   unshift @@INC, (split '@@PATH_SEPARATOR@@', $perllibdir);
 }
 
@@@@ -57,7 +57,7 @@@@
 # @@system_includes can be augmented with the `dirlist' file.  Also
 # --acdir will reset both @@automake_includes and @@system_includes.
 my @@user_includes = ();
-my @@automake_includes = ("@@datadir@@/aclocal-$APIVERSION");
+my @@automake_includes = ("@@datadir@@/aclocal");
 my @@system_includes = ('@@datadir@@/aclocal');
 
 # Whether we should copy M4 file in $user_includes[0].
Index: automake.in
--- automake.in.orig	2009-05-17 15:50:19 +0200
+++ automake.in	2009-05-28 19:46:09 +0200
@@@@ -31,7 +31,7 @@@@
 
 BEGIN
 {
-  my $perllibdir = $ENV{'perllibdir'} || '@@datadir@@/@@PACKAGE@@-@@APIVERSION@@';
+  my $perllibdir = $ENV{'perllibdir'} || '@@datadir@@/@@PACKAGE@@';
   unshift @@INC, (split '@@PATH_SEPARATOR@@', $perllibdir);
 
   # Override SHELL.  This is required on DJGPP so that system() uses
Index: configure
--- configure.orig	2009-05-17 15:43:44 +0200
+++ configure	2009-05-28 19:46:09 +0200
@@@@ -2349,7 +2349,7 @@@@
 
 
 # A versioned directory, defined here for convenience.
-pkgvdatadir="\${datadir}/$PACKAGE-$APIVERSION"
+pkgvdatadir="\${datadir}/$PACKAGE"
 
 
 # $AUTOMAKE and $ACLOCAL are always run after a `cd $top_srcdir',
Index: lib/Automake/Config.in
--- lib/Automake/Config.in.orig	2009-05-17 15:19:29 +0200
+++ lib/Automake/Config.in	2009-05-28 19:46:35 +0200
@@@@ -28,7 +28,7 @@@@
 our $APIVERSION = '@@APIVERSION@@';
 our $PACKAGE = '@@PACKAGE@@';
 our $VERSION = '@@VERSION@@';
-our $libdir = '@@datadir@@/@@PACKAGE@@-@@APIVERSION@@';
+our $libdir = '@@datadir@@/@@PACKAGE@@';
 our $perl_threads = @@PERL_THREADS@@;
 
 1;;
Index: m4/Makefile.in
--- m4/Makefile.in.orig	2009-05-17 15:43:45 +0200
+++ m4/Makefile.in	2009-05-28 19:46:09 +0200
@@@@ -165,7 +165,7 @@@@
 top_build_prefix = @@top_build_prefix@@
 top_builddir = @@top_builddir@@
 top_srcdir = @@top_srcdir@@
-m4datadir = $(datadir)/aclocal-$(APIVERSION)
+m4datadir = $(datadir)/aclocal
 dist_m4data_DATA = \
 $(top_srcdir)/m4/amversion.m4 \
 as.m4 \
@


1.6
log
@upgrading package: automake 1.9.6 -> 1.10
@
text
@d2 3
a4 3
--- Makefile.in.orig	2006-10-15 19:25:23 +0200
+++ Makefile.in	2006-11-11 19:17:47 +0100
@@@@ -68,7 +68,7 @@@@
d12 1
a12 1
   { test ! -d $(distdir) \
d14 3
a16 3
--- aclocal.in.orig	2006-10-15 18:19:37 +0200
+++ aclocal.in	2006-11-11 19:18:37 +0100
@@@@ -30,7 +30,7 @@@@
d25 1
a25 1
@@@@ -56,7 +56,7 @@@@
d35 3
a37 3
--- automake.in.orig	2006-10-15 18:19:37 +0200
+++ automake.in	2006-11-11 19:17:47 +0100
@@@@ -32,7 +32,7 @@@@
d47 3
a49 3
--- configure.orig	2006-10-15 19:25:22 +0200
+++ configure	2006-11-11 19:17:47 +0100
@@@@ -2197,7 +2197,7 @@@@
d59 3
a61 3
--- lib/Automake/Config.in.orig	2005-05-14 21:52:09 +0200
+++ lib/Automake/Config.in	2006-11-11 19:18:55 +0100
@@@@ -30,7 +30,7 @@@@
d67 1
a69 1
 
d71 4
a74 4
--- m4/Makefile.in.orig	2006-10-15 19:25:24 +0200
+++ m4/Makefile.in	2006-11-11 19:19:09 +0100
@@@@ -143,7 +143,7 @@@@
 target_alias = @@target_alias@@
@


1.5
log
@upgrading package: automake 1.9 -> 1.9.1
@
text
@d2 3
a4 3
--- Makefile.in.orig	2004-04-18 13:29:47.000000000 +0200
+++ Makefile.in	2004-04-20 09:13:08.000000000 +0200
@@@@ -67,7 +67,7 @@@@
d14 3
a16 3
--- aclocal.in.orig	2004-04-10 19:15:32.000000000 +0200
+++ aclocal.in	2004-04-20 09:14:27.000000000 +0200
@@@@ -29,7 +29,7 @@@@
d25 9
a33 13
@@@@ -620,12 +620,6 @@@@
   $default_dirlist="$acdir/dirlist"
     if $acdir ne $default_acdir;
 
-  # 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-$APIVERSION")
-    if $acdir eq $default_acdir;
-
   # By default $(datadir)/aclocal doesn't exist.  We don't want to
   # get an error in the case where we are searching the default
   # directory and it hasn't been created.
d35 3
a37 3
--- automake.in.orig	2004-04-10 19:15:32.000000000 +0200
+++ automake.in	2004-04-20 09:13:59.000000000 +0200
@@@@ -31,7 +31,7 @@@@
d47 3
a49 3
--- configure.orig	2004-04-18 13:29:46.000000000 +0200
+++ configure	2004-04-20 09:13:08.000000000 +0200
@@@@ -1728,7 +1728,7 @@@@
d59 8
a66 8
--- lib/Automake/Config.in.orig	2003-12-25 19:00:29.000000000 +0100
+++ lib/Automake/Config.in	2004-04-20 09:13:08.000000000 +0200
@@@@ -32,7 +32,7 @@@@
 $APIVERSION = '@@APIVERSION@@';
 $PACKAGE = '@@PACKAGE@@';
 $VERSION = '@@VERSION@@';
-$libdir = '@@datadir@@/@@PACKAGE@@-@@APIVERSION@@';
+$libdir = '@@datadir@@/@@PACKAGE@@';
d71 3
a73 5
--- m4/Makefile.in.orig	2004-04-18 13:29:48.000000000 +0200
+++ m4/Makefile.in	2004-04-20 09:13:08.000000000 +0200
@@@@ -120,7 +120,7 @@@@
 sharedstatedir = @@sharedstatedir@@
 sysconfdir = @@sysconfdir@@
d75 2
@


1.5.10.1
log
@MFC: make up leeway for 2_STABLE by virtue of build-time results
@
text
@d2 3
a4 3
--- Makefile.in.orig	2006-10-15 19:25:23 +0200
+++ Makefile.in	2006-11-11 19:17:47 +0100
@@@@ -68,7 +68,7 @@@@
d14 3
a16 3
--- aclocal.in.orig	2006-10-15 18:19:37 +0200
+++ aclocal.in	2006-11-11 19:18:37 +0100
@@@@ -30,7 +30,7 @@@@
d25 13
a37 9
@@@@ -56,7 +56,7 @@@@
 # @@system_includes can be augmented with the `dirlist' file.  Also
 # --acdir will reset both @@automake_includes and @@system_includes.
 my @@user_includes = ();
-my @@automake_includes = ("@@datadir@@/aclocal-$APIVERSION");
+my @@automake_includes = ("@@datadir@@/aclocal");
 my @@system_includes = ('@@datadir@@/aclocal');
 
 # Whether we should copy M4 file in $user_includes[0].
d39 3
a41 3
--- automake.in.orig	2006-10-15 18:19:37 +0200
+++ automake.in	2006-11-11 19:17:47 +0100
@@@@ -32,7 +32,7 @@@@
d51 3
a53 3
--- configure.orig	2006-10-15 19:25:22 +0200
+++ configure	2006-11-11 19:17:47 +0100
@@@@ -2197,7 +2197,7 @@@@
d63 8
a70 8
--- lib/Automake/Config.in.orig	2005-05-14 21:52:09 +0200
+++ lib/Automake/Config.in	2006-11-11 19:18:55 +0100
@@@@ -30,7 +30,7 @@@@
 our $APIVERSION = '@@APIVERSION@@';
 our $PACKAGE = '@@PACKAGE@@';
 our $VERSION = '@@VERSION@@';
-our $libdir = '@@datadir@@/@@PACKAGE@@-@@APIVERSION@@';
+our $libdir = '@@datadir@@/@@PACKAGE@@';
d75 5
a79 3
--- m4/Makefile.in.orig	2006-10-15 19:25:24 +0200
+++ m4/Makefile.in	2006-11-11 19:19:09 +0100
@@@@ -143,7 +143,7 @@@@
a80 2
 top_builddir = @@top_builddir@@
 top_srcdir = @@top_srcdir@@
@


1.4
log
@upgrading package: automake 1.8.3 -> 1.8.3b
@
text
@d53 1
a53 1
@@@@ -1953,7 +1953,7 @@@@
d57 2
a58 2
-pkgvdatadir="\${datadir}/automake-${APIVERSION}"
+pkgvdatadir="\${datadir}/automake"
@


1.3
log
@fixed libdir path
@
text
@d2 3
a4 3
--- Makefile.in.orig	2003-12-10 19:35:11.000000000 +0100
+++ Makefile.in	2003-12-11 09:12:47.000000000 +0100
@@@@ -68,7 +68,7 @@@@
d14 2
a15 2
--- aclocal.in.orig	2003-12-05 22:19:39.000000000 +0100
+++ aclocal.in	2003-12-11 09:11:05.000000000 +0100
d22 1
a22 1
   unshift @@INC, (split ':', $perllibdir);
d25 1
a25 1
@@@@ -519,12 +519,6 @@@@
d39 2
a40 2
--- automake.in.orig	2003-12-08 18:53:57.000000000 +0100
+++ automake.in	2003-12-11 09:12:04.000000000 +0100
d47 1
a47 1
   unshift @@INC, (split ':', $perllibdir);
d51 3
a53 3
--- configure.orig	2003-12-10 19:35:10.000000000 +0100
+++ configure	2003-12-11 09:08:23.000000000 +0100
@@@@ -1710,7 +1710,7 @@@@
d62 1
a62 12
Index: m4/Makefile.in
--- m4/Makefile.in.orig	2003-12-10 19:35:12.000000000 +0100
+++ m4/Makefile.in	2003-12-11 09:09:07.000000000 +0100
@@@@ -119,7 +119,7 @@@@
 sharedstatedir = @@sharedstatedir@@
 sysconfdir = @@sysconfdir@@
 target_alias = @@target_alias@@
-m4datadir = $(datadir)/aclocal-$(APIVERSION)
+m4datadir = $(datadir)/aclocal
 dist_m4data_DATA = \
 $(top_srcdir)/m4/amversion.m4 \
 as.m4 \
d64 1
a64 1
+++ lib/Automake/Config.in	2004-04-15 12:39:21.000000000 +0200
d74 12
@


1.2
log
@upgrading package: automake 1.7.9 -> 1.8
@
text
@d74 11
@


1.1
log
@fix filesystem layout (especially 'aclocal' directory location) and get rid of autoconf dependency
@
text
@d1 6
a6 13
Index: m4/Makefile.in
--- m4/Makefile.in.orig	2003-10-07 00:24:44.000000000 +0200
+++ m4/Makefile.in	2003-11-08 13:38:11.000000000 +0100
@@@@ -94,7 +94,7 @@@@
 sysconfdir = @@sysconfdir@@
 target_alias = @@target_alias@@
 
-m4datadir = $(datadir)/aclocal-$(APIVERSION)
+m4datadir = $(datadir)/aclocal
 
 dist_m4data_DATA = \
 as.m4 \
@@@@ -196,7 +196,7 @@@@
d8 5
a12 19
 
 top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+distdir = $(top_distdir)/$(PACKAGE)
 
 distdir: $(DISTFILES)
 	@@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
Index: lib/Makefile.in
--- lib/Makefile.in.orig	2003-10-07 00:24:44.000000000 +0200
+++ lib/Makefile.in	2003-11-08 13:38:11.000000000 +0100
@@@@ -294,7 +294,7 @@@@
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+distdir = $(top_distdir)/$(PACKAGE)
 
 distdir: $(DISTFILES)
 	@@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
d14 2
a15 2
--- aclocal.in.orig	2003-10-07 00:30:46.000000000 +0200
+++ aclocal.in	2003-11-08 13:38:43.000000000 +0100
d22 1
a22 1
   unshift @@INC, $perllibdir;
d25 9
a33 9
@@@@ -188,12 +188,6 @@@@
     $default_dirlist="$acdir/dirlist"
 	if $acdir ne $default_acdir;
 
-    # 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-$APIVERSION")
-	if $acdir eq $default_acdir;
d35 3
a37 15
     # By default $(datadir)/aclocal doesn't exist.  We don't want to
     # get an error in the case where we are searching the default
     # directory and it hasn't been created.
Index: configure
--- configure.orig	2003-10-07 00:24:46.000000000 +0200
+++ configure	2003-11-08 13:38:11.000000000 +0100
@@@@ -1623,7 +1623,7 @@@@
 
 
 # A versioned directory, defined here for convenience.
-pkgvdatadir="\${datadir}/automake-${APIVERSION}"
+pkgvdatadir="\${datadir}/automake"
 
 
 # $AUTOMAKE and $ACLOCAL are always run after a `cd $top_srcdir',
d39 2
a40 2
--- automake.in.orig	2003-10-07 00:11:08.000000000 +0200
+++ automake.in	2003-11-08 13:38:11.000000000 +0100
d47 1
a47 1
   unshift @@INC, $perllibdir;
d50 5
a54 6
@@@@ -135,7 +135,7 @@@@
 # VERSION as string so that eg version 0.30 will print correctly.
 my $VERSION = '@@VERSION@@';
 my $PACKAGE = '@@PACKAGE@@';
-my $libdir = '@@datadir@@/@@PACKAGE@@-@@APIVERSION@@';
+my $libdir = '@@datadir@@/@@PACKAGE@@';
d56 3
a58 7
 # Some regular expressions.  One reason to put them here is that it
 # makes indentation work better in Emacs.
Index: Makefile.in
--- Makefile.in.orig	2003-10-07 00:24:44.000000000 +0200
+++ Makefile.in	2003-11-08 13:38:11.000000000 +0100
@@@@ -415,7 +415,7 @@@@
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
a59 3
 top_distdir = .
-distdir = $(PACKAGE)-$(VERSION)
+distdir = $(PACKAGE)
d61 13
a73 2
 am__remove_distdir = \
   { test ! -d $(distdir) \
@