From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Fri, 4 Jan 2013 09:23:36 +0000 (+0100)
Subject: Merge branch 'plans' into maint
X-Git-Tag: v1.13b~140
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa0fc1bf55b423a401c98dff0cc0dcdb83136b8e;p=thirdparty%2Fautomake.git

Merge branch 'plans' into maint

* plans:
  plans: add the "PLANS" directory

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

Conflicts:
	Makefile.am
---

fa0fc1bf55b423a401c98dff0cc0dcdb83136b8e
diff --cc Makefile.am
index d868501f9,50e6b9b43..3c40f27cb
--- a/Makefile.am
+++ b/Makefile.am
@@@ -69,7 -69,10 +69,8 @@@ EXTRA_DIST += 
    $(AUTOMAKESOURCES) \
    bootstrap.sh \
    GNUmakefile \
-   HACKING
 -  maint.mk \
 -  syntax-checks.mk \
+   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