diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-01-04 10:23:36 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-01-04 10:23:36 +0100 |
| commit | fa0fc1bf55b423a401c98dff0cc0dcdb83136b8e (patch) | |
| tree | 5091a6b05cef3e75c5f198528864b3010080988e /Makefile.am | |
| parent | 5df23a7accb0e82109898f02818c2f65a0bb7b91 (diff) | |
| parent | 5fdf75877fd22aed951678d92b291b3b7ca1926f (diff) | |
| download | automake-fa0fc1bf55b423a401c98dff0cc0dcdb83136b8e.tar.gz | |
Merge branch 'plans' into maint
* plans:
plans: add the "PLANS" directory
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Conflicts:
Makefile.am
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index d868501f9..3c40f27cb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -69,7 +69,8 @@ EXTRA_DIST += \ $(AUTOMAKESOURCES) \ bootstrap.sh \ GNUmakefile \ - HACKING + HACKING \ + PLANS # Make versioned links. We only run the transform on the root name; # then we make a versioned link with the transformed base name. This |