diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-06-16 16:56:36 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-06-16 16:58:20 +0200 |
| commit | 43d62e07f2031f21648e41a233ae3213cf99f1c8 (patch) | |
| tree | 8b5c45a88f82f207e6bd2b50300978331c6eca9e /automake.in | |
| parent | ecebc6c22d7edd81372df837677de4bdce363199 (diff) | |
| parent | 5cfe77c655c8c9a82c1cc1686c5da4c9cdd05c45 (diff) | |
| download | automake-43d62e07f2031f21648e41a233ae3213cf99f1c8.tar.gz | |
Merge branch 'maint'
* maint:
news: update w.r.t. introduction of AM_DISTCHECK_CONFIGURE_FLAGS
tests: optimize tests on primary/prefix mismatch for speed
Warnings about primary/prefix mismatch fixed and extended.
maintcheck: DISTCHECK_CONFIGURE_FLAGS can be defined on make cmdline
distcheck: add support for AM_DISTCHECK_CONFIGURE_FLAGS
docs: better documentation for silent make rules
Diffstat (limited to 'automake.in')
| -rw-r--r-- | automake.in | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/automake.in b/automake.in index 3d6993a09..782768022 100644 --- a/automake.in +++ b/automake.in @@ -247,11 +247,11 @@ my @common_sometimes = # Standard directories from the GNU Coding Standards, and additional # pkg* directories from Automake. Stored in a hash for fast member check. my %standard_prefix = - map { $_ => 1 } (qw(bin data dataroot dvi exec html include info - lib libexec lisp localstate man man1 man2 man3 - man4 man5 man6 man7 man8 man9 oldinclude pdf - pkgdatadir pkgincludedir pkglibdir pkglibexecdir - ps sbin sharedstate sysconf)); + map { $_ => 1 } (qw(bin data dataroot doc dvi exec html include info + lib libexec lisp locale localstate man man1 man2 + man3 man4 man5 man6 man7 man8 man9 oldinclude pdf + pkgdata pkginclude pkglib pkglibexec ps sbin + sharedstate sysconf)); # Copyright on generated Makefile.ins. my $gen_copyright = "\ @@ -2642,7 +2642,7 @@ sub handle_libtool sub handle_programs { my @proglist = &am_install_var ('progs', 'PROGRAMS', - 'bin', 'sbin', 'libexec', 'pkglib', + 'bin', 'sbin', 'libexec', 'pkglibexec', 'noinst', 'check'); return if ! @proglist; @@ -3764,8 +3764,8 @@ sub handle_man_pages sub handle_data { &am_install_var ('-noextra', '-candist', 'data', 'DATA', - 'data', 'dataroot', 'dvi', 'html', 'pdf', 'ps', - 'sysconf', 'sharedstate', 'localstate', + 'data', 'dataroot', 'doc', 'dvi', 'html', 'pdf', + 'ps', 'sysconf', 'sharedstate', 'localstate', 'pkgdata', 'lisp', 'noinst', 'check'); } |