automake/534: DISTFILES containing a directory and files in that directory

[Peter Breitenlohner]

>Number:         534
>Category:       automake
>Synopsis:       DISTFILES containing a directory and files in that directory
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    adl
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Thu Jan 29 16:31:03 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Peter Breitenlohner <peb@...>
>Release:        1.10.2
>Organization:
>Environment:

>Description:
I tried to include a Third-Party package (automake manual 23.2) using the suggestion in the last paragraph, i.e., doing everything with a proxy Makefile.am such as:

   bin_PROGRAMS = prog
   prog_SOURCES = sub/prog.c
   EXTRA_DIST = sub

with the result that 'make distcheck' failed.

In this example the use of nodist_prog_SOURCES would of course avoid this problem, but there may be other situations
where this cannot be done easily.
>How-To-Repeat:
See above
>Fix:
Attached is a patch addressing this problem.

The solution may be somewhat simple minded. Maybe the chmod has to be replaced by 'find ... || chmod ...' as is done in other places.
>Release-Note:
>Audit-Trail:
>Unformatted:
----gnatsweb-attachment----
Content-Type: application/octet-stream; name="0001-DISTFILES-containing-a-directory-and-files-in-that-d.patch"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="0001-DISTFILES-containing-a-directory-and-files-in-that-d.patch"

RnJvbSA3YjdiM2VlYTZhOTY5ZDIyMmZmOWMyN2YxM2UxODc5ZjM3NjA4YTBhIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBQZXRlciBCcmVpdGVubG9obmVyIDxwZWJAbXBwbXUubXBnLmRl
PgpEYXRlOiBUaHUsIDI5IEphbiAyMDA5IDE2OjAzOjM2ICswMTAwClN1YmplY3Q6IFtQQVRDSF0g
RElTVEZJTEVTIGNvbnRhaW5pbmcgYSBkaXJlY3RvcnkgYW5kIGZpbGVzIGluIHRoYXQgZGlyZWN0
b3J5LgoKKiBsaWIvYW0vZGlzdGRpci5hbTogSGFuZGxlIHRoaXMgc2l0dWF0aW9uLgoqIHRlc3Rz
L2Rpc3RkaXIudGVzdDogRXh0ZW5kIHRlc3QgdG8gdGhhdCBjYXNlLgotLS0KIENoYW5nZUxvZyAg
ICAgICAgICB8ICAgIDYgKysrKysrCiBsaWIvYW0vZGlzdGRpci5hbSAgfCAgICA2ICsrKysrKwog
dGVzdHMvZGlzdGRpci50ZXN0IHwgICAxMiArKysrKysrKy0tLS0KIDMgZmlsZXMgY2hhbmdlZCwg
MjAgaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9DaGFuZ2VMb2cg
Yi9DaGFuZ2VMb2cKaW5kZXggOGVkNDA4YS4uZjNlMjY4NiAxMDA2NDQKLS0tIGEvQ2hhbmdlTG9n
CisrKyBiL0NoYW5nZUxvZwpAQCAtMSwzICsxLDkgQEAKKzIwMDktMDEtMjkgIFBldGVyIEJyZWl0
ZW5sb2huZXIgIDxwZWJAbXBwbXUubXBnLmRlPgorCisJRElTVEZJTEVTIGNvbnRhaW5pbmcgYSBk
aXJlY3RvcnkgYW5kIGZpbGVzIGluIHRoYXQgZGlyZWN0b3J5LgorCSogbGliL2FtL2Rpc3RkaXIu
YW06IEhhbmRsZSB0aGlzIHNpdHVhdGlvbi4KKwkqIHRlc3RzL2Rpc3RkaXIudGVzdDogRXh0ZW5k
IHRlc3QgdG8gdGhhdCBjYXNlLgorCiAyMDA5LTAxLTIwICBSYWxmIFdpbGRlbmh1ZXMgIDxSYWxm
LldpbGRlbmh1ZXNAZ214LmRlPgogCiAJQnVtcCBjb3B5cmlnaHQgeWVhcnMuCmRpZmYgLS1naXQg
YS9saWIvYW0vZGlzdGRpci5hbSBiL2xpYi9hbS9kaXN0ZGlyLmFtCmluZGV4IDgxZDIyMTAuLjVi
YTRhMjAgMTAwNjQ0Ci0tLSBhL2xpYi9hbS9kaXN0ZGlyLmFtCisrKyBiL2xpYi9hbS9kaXN0ZGly
LmFtCkBAIC0xOTgsOCArMTk4LDE0IEBAIGVuZGlmICU/VE9QRElSX1AlCiAjIyBkaXJlY3Rvcnkg
ZXhpc3RzIG9ubHkgaW4gJChzcmNkaXIpLCBiZWNhdXNlIHNvbWUgdmVuZG9yIE1ha2UgKHN1Y2gK
ICMjIGFzIFRydTY0KSB3aWxsIG1hZ2ljYWxseSBjcmVhdGUgYW4gZW1wdHkgZGlyZWN0b3J5IGlu
IGAuJwogCSAgICBkaXI9YGVjaG8gIi8kJGZpbGUiIHwgc2VkIC1lICdzLC9bXi9dKiQkLCwnYDsg
XAorIyMgSWYgdGhlIGRlc3RpbmF0aW9uIGRpcmVjdG9yeSBhbHJlYWR5IGV4aXN0cywgaXQgbWF5
IGNvbnRhaW4gcmVhZC1vbmx5CisjIyBmaWxlcywgZS5nLiwgZHVyaW5nIGBtYWtlIGRpc3RjaGVj
aycuCisJICAgIGlmIHRlc3QgLWQgIiQoZGlzdGRpcikvJCRmaWxlIjsgdGhlbiBcCisJICAgICAg
Y2htb2QgLVIgYSt3ICIkKGRpc3RkaXIpLyQkZmlsZSI7IFwKKwkgICAgZmk7IFwKIAkgICAgaWYg
dGVzdCAtZCAkKHNyY2RpcikvJCRmaWxlICYmIHRlc3QgJCRkICE9ICQoc3JjZGlyKTsgdGhlbiBc
CiAJICAgICAgY3AgLXBSICQoc3JjZGlyKS8kJGZpbGUgIiQoZGlzdGRpcikkJGRpciIgfHwgZXhp
dCAxOyBcCisJICAgICAgY2htb2QgLVIgYSt3ICIkKGRpc3RkaXIpLyQkZmlsZSI7IFwKIAkgICAg
Zmk7IFwKIAkgICAgY3AgLXBSICQkZC8kJGZpbGUgIiQoZGlzdGRpcikkJGRpciIgfHwgZXhpdCAx
OyBcCiAJICBlbHNlIFwKZGlmZiAtLWdpdCBhL3Rlc3RzL2Rpc3RkaXIudGVzdCBiL3Rlc3RzL2Rp
c3RkaXIudGVzdAppbmRleCA2NDFhMzA3Li5lZmYyYWMxIDEwMDc1NQotLS0gYS90ZXN0cy9kaXN0
ZGlyLnRlc3QKKysrIGIvdGVzdHMvZGlzdGRpci50ZXN0CkBAIC0xLDUgKzEsNiBAQAogIyEgL2Jp
bi9zaAotIyBDb3B5cmlnaHQgKEMpIDE5OTYsIDIwMDEsIDIwMDIsIDIwMDMsIDIwMDYsIDIwMDcg
IEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbiwgSW5jLgorIyBDb3B5cmlnaHQgKEMpIDE5OTYsIDIw
MDEsIDIwMDIsIDIwMDMsIDIwMDYsIDIwMDcsIDIwMDkgIEZyZWUgU29mdHdhcmUKKyMgRm91bmRh
dGlvbiwgSW5jLgogIwogIyBUaGlzIHByb2dyYW0gaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiBy
ZWRpc3RyaWJ1dGUgaXQgYW5kL29yIG1vZGlmeQogIyBpdCB1bmRlciB0aGUgdGVybXMgb2YgdGhl
IEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieQpAQCAtMTgsNiArMTks
NyBAQAogIyBzdXJlICpzcmNkaXIgaXMgcHJvcGVybHkgaGFuZGxlZC4gIE5vdGUgdGhhdCB1c2lu
ZyBgLi8nLCBhcyBpbgogIyAgIEVYVFJBX0RJU1QgPSAuL2pvZQogIyBkb2VzIG5vdCB3b3JrIHBv
cnRhYmx5OiBpdCBmYWlscyB3aXRoIEhQLVVYIGFuZCBUcnU2NCBtYWtlLgorIyBBbHNvIHRlc3Qg
RElTVEZJTEVTIGNvbnRhaW5pbmcgYSBkaXJlY3RvcnkgYW5kIGEgZmlsZSBpbiBpdC4KIAogLiAu
L2RlZnMgfHwgRXhpdCAxCiAKQEAgLTI2LDIwICsyOCwyMiBAQCBzZXQgLWUKIGVjaG8gQUNfT1VU
UFVUID4+Y29uZmlndXJlLmluCiAKIGNhdCA+IE1ha2VmaWxlLmFtIDw8ICdFTkQnCi1FWFRSQV9E
SVNUID0gZm9vL2JhciBqb2UgJCh0b3Bfc3JjZGlyKS93b28vZG9vICQoc3JjZGlyKS9kYWRhCitp
bmNsdWRlX0hFQURFUlMgPSBzb21lL2ZpbGUKK0VYVFJBX0RJU1QgPSBmb28vYmFyIGpvZSAkKHRv
cF9zcmNkaXIpL3dvby9kb28gJChzcmNkaXIpL2RhZGEgc29tZQogY2hlY2stbG9jYWw6CiAJdGVz
dCAtZiAkKHNyY2RpcikvZm9vL2JhcgogCXRlc3QgLWYgJChzcmNkaXIpL3dvby9kb28KIAl0ZXN0
IC1mICQoc3JjZGlyKS9qb2UKIAl0ZXN0IC1mICQoc3JjZGlyKS9kYWRhCisJdGVzdCAtZiAkKHNy
Y2Rpcikvc29tZS9maWxlCiBFTkQKIAogJEFDTE9DQUwKICRBVVRPQ09ORgogJEFVVE9NQUtFCiAK
LW1rZGlyIGZvbyB3b28KLXRvdWNoIGZvby9iYXIgam9lIHdvby9kb28gZGFkYQorbWtkaXIgZm9v
IHdvbyBzb21lCit0b3VjaCBmb28vYmFyIGpvZSB3b28vZG9vIGRhZGEgc29tZS9maWxlCiAKIG1r
ZGlyIGJ1aWxkCiBjZCBidWlsZAotLSAKMS42LjAuMwoK