[Guile-commits] 127/437: Extra cleanup before update to new codebase.

[Andy Wingo]

wingo pushed a commit to branch lightning
in repository guile.

commit 75d99beb210c8a8ec4575eba175615cc6bce1f37
Author: pcpa <address@hidden>
Date:   Sun Dec 2 19:08:34 2012 -0200

    Extra cleanup before update to new codebase.
    
    2012-12-02 Paulo Andrade <address@hidden>
        * .cvsignore: Removed for extra cleanup.
    
        * build-aux: Rename directory to m4.
    
        * m4: Renamed to "default" name and for consistency with merge
        with code rework to be imported in lightning.
    
        * .gitignore, configure.ac, Makefile.am, doc/Makefile.am:
        Update for build-aux to m4 rename.
---
 .cvsignore                     |  1 -
 .gitignore                     | 14 +++++++-------
 ChangeLog                      | 11 +++++++++++
 Makefile.am                    |  4 ++--
 configure.ac                   |  4 ++--
 doc/Makefile.am                |  4 ++--
 {build-aux => m4}/lightning.m4 |  0
 7 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index d899218..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-autom4te.cache
diff --git a/.gitignore b/.gitignore
index 9d98793..7107bb3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,13 +5,13 @@ INSTALL
 Makefile.in
 config.h.in
 configure
-build-aux/config.guess
-build-aux/config.sub
-build-aux/depcomp
-build-aux/install-sh
-build-aux/mdate-sh
-build-aux/missing
-build-aux/texinfo.tex
+m4/config.guess
+m4/config.sub
+m4/depcomp
+m4/install-sh
+m4/mdate-sh
+m4/missing
+m4/texinfo.tex
 doc/Makefile.in
 lightning/Makefile.in
 tests/Makefile.in
diff --git a/ChangeLog b/ChangeLog
index 960fc63..fb4afd6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2012-12-02 Paulo Andrade <address@hidden>
+       * .cvsignore: Removed for extra cleanup.
+
+       * build-aux: Rename directory to m4.
+
+       * m4: Renamed to "default" name and for consistency with merge
+       with code rework to be imported in lightning.
+
+       * .gitignore, configure.ac, Makefile.am, doc/Makefile.am:
+       Update for build-aux to m4 rename.
+
 2012-12-01 Paulo Andrade <address@hidden>
 
        * opcode/Makefile.am, opcode/Makefile.in, opcode/ansidecl.h,
diff --git a/Makefile.am b/Makefile.am
index 0200f32..b2c47c4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,10 @@
 # Automake requirements:
 AUTOMAKE_OPTIONS = 1.8 gnu
-ACLOCAL_AMFLAGS = -I build-aux
+ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = . doc lightning tests
 
 include_HEADERS = lightning.h
 
 aclocaldir = $(datadir)/aclocal
-dist_aclocal_DATA = build-aux/lightning.m4
+dist_aclocal_DATA = m4/lightning.m4
diff --git a/configure.ac b/configure.ac
index 7033446..ce7e0c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,8 +9,8 @@ dnl ----------------------------- HOST SYSTEM 
----------------------------------
 
 AC_PREREQ(2.54)
 AC_INIT([GNU lightning], 1.2c, address@hidden, lightning)
-AC_CONFIG_AUX_DIR(build-aux)
-AC_CONFIG_MACRO_DIR(build-aux)
+AC_CONFIG_AUX_DIR(m4)
+AC_CONFIG_MACRO_DIR(m4)
 AC_CONFIG_SRCDIR([lightning.h])
 
 AC_CANONICAL_TARGET
diff --git a/doc/Makefile.am b/doc/Makefile.am
index e482f69..b53a4aa 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,5 @@
-TEXI2DVI=$(top_srcdir)/build-aux/texi2dvi
-HELP2MAN = $(top_srcdir)/build-aux/help2man
+TEXI2DVI=$(top_srcdir)/m4/texi2dvi
+HELP2MAN = $(top_srcdir)/m4/help2man
 
 info_TEXINFOS = lightning.texi 
 EXTRA_TEXINFOS = u-lightning.texi p-lightning.texi
diff --git a/build-aux/lightning.m4 b/m4/lightning.m4
similarity index 100%
rename from build-aux/lightning.m4
rename to m4/lightning.m4