References:
 <http://lists.gnu.org/archive/html/automake-patches/2010-12/msg00106.html>
 <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7647>

-*-*-

Hello automakers.

I've rebased the patch on latest maint, removed trailing whitespaces,
fixed the copyright years, and extended the new testcase
`primary-prefix-documented-valid.test' to cover the new examples
added in the manual with commit `v1.11-261-gd5a408d' -- reference:
 <http://lists.gnu.org/archive/html/automake-patches/2011-01/msg00008.html>

Below is what I've squashed into the rebased patch; the whole
amended patch is attached.

OK for maint?

Regards,
   Stefano

-*-*-

diff --git a/ChangeLog b/ChangeLog
index 08403ef..625d580 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-2010-12-17  Stefano Lattarini  <stefano.lattarini@gmail.com>
+2011-01-03  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
        Warnings about primary/prefix mismatch fixed and extended.
        * automake.in (%standard_prefix): Add `doc' and `locale'.
diff --git a/tests/primary-prefix-couples-documented-valid.test b/tests/primary-prefix-couples-documented-valid.test
index 893704f..5bc851c 100755
--- a/tests/primary-prefix-couples-documented-valid.test
+++ b/tests/primary-prefix-couples-documented-valid.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
+# Copyright (C) 2011 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -25,6 +25,7 @@ set -e
 cat >> configure.in <<'END'
 AC_PROG_CC
 AC_PROG_CC
+AC_PROG_RANLIB
 AC_PROG_LIBTOOL
 AM_PROG_GCJ
 AM_PATH_PYTHON
@@ -65,12 +65,17 @@ quaternion_la_SOURCES = quaternion.c support.c support.h
 quaternion_la_LDFLAGS = -avoid-version -module
 
 myexecbindir = /exec
-myexecbin_PROGRAMS = foo
+myexecbin_PROGRAMS = zardoz
 
 foodir = $(prefix)/foo
 barexecdir = $(prefix)/bar/binaries
 foo_SCRIPTS = foo.sh
 barexec_SCRIPTS = quux.pl
+
+my_execbindir = $(pkglibdir)
+my_doclibdir = $(docdir)
+my_execbin_PROGRAMS = foo
+my_doclib_LIBRARIES = libquux.a
 END
 
 $ACLOCAL
diff --git a/tests/primary-prefix-couples-force-valid.test b/tests/primary-prefix-couples-force-valid.test
index 02728b9..159f297 100755
--- a/tests/primary-prefix-couples-force-valid.test
+++ b/tests/primary-prefix-couples-force-valid.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
+# Copyright (C) 2011 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/primary-prefix-invalid-couples.test b/tests/primary-prefix-invalid-couples.test
index 1a3d4e0..bd7a346 100755
--- a/tests/primary-prefix-invalid-couples.test
+++ b/tests/primary-prefix-invalid-couples.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
+# Copyright (C) 2011 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/primary-prefix-valid-couples.test b/tests/primary-prefix-valid-couples.test
index 8acb32e..b6b53dc 100755
--- a/tests/primary-prefix-valid-couples.test
+++ b/tests/primary-prefix-valid-couples.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
+# Copyright (C) 2011 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -50,8 +50,8 @@ echo '@setfilename foo' > foo.texi
 : > Makefile.am
 
 for p in bin sbin libexec pkglibexec; do
-  echo "${p}_PROGRAMS = prog-$p" >> Makefile.am 
-done 
+  echo "${p}_PROGRAMS = prog-$p" >> Makefile.am
+done
 
 for p in lib pkglib; do
   echo "${p}_LIBRARIES = libs-$p.a" >> Makefile.am
@@ -74,7 +74,7 @@ done
 for p in man man1 man2 man3 man4 man5 man6 man7 man8 man9; do
   echo "${p}_MANS = bar.$p"
 done
-  
+
 echo "info_TEXINFOS = foo.texi" >> Makefile.am
 echo "lisp_LISP = foo.el" >> Makefile.am
 echo "python_PYTHON = foo.py" >> Makefile.am