Build: Put build utilities in the config/ subdirectory.

Leaving AC_CONFIG_AUX_DIR unspecified causes auto* to look for the
various utilities in parent directories, which breaks mdw-build.  I
could explicitly set AC_CONFIG_AUX_DIR to `.', but that misses an
opportunity to tidy up.

diff --git a/.gitignore b/.gitignore
index f8268605d815964e53cccbda78166d59ab52e607..7107b05990170c46fa07113bde504bc67bc50c9f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,23 +1,12 @@
 Makefile.in
 aclocal.m4
 Makefile.in
 aclocal.m4

-build

 configure
 configure

-deb-build
-deb-noadns
+config

 COPYING.LIB
 COPYING
 config.guess
 config.sub
 install-sh
 COPYING.LIB
 COPYING
 config.guess
 config.sub
 install-sh

-lib-config.in
-ltmain.sh
-maninst

 mdwopt.c
 mdwopt.h
 mdwopt.c
 mdwopt.h

-missing
-mkinstalldirs

 autom4te.cache
 autom4te.cache

-unihash.in
-depcomp
-compile
-

diff --git a/.links b/.links
index 4aacfeb9013c8749e17a6e371ebdbc6aa6908fe4..f37dca93483f2ae7a3d227cd113b78a00b8bc61b 100644 (file)
--- a/.links
+++ b/.links
@@ -1,5 +1,4 @@
-lib-config.in
-maninst
+config/maninst

 mdwopt.c
 mdwopt.h
 COPYING
 mdwopt.c
 mdwopt.h
 COPYING

diff --git a/Makefile.am b/Makefile.am
index c559b298f4823cf2f20c8a774644cee9884e7774..131a94c9b139d9c5c55675ba2f0e08fcb1d9b9ec 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -246,7 +246,7 @@ uninstall-man:
 CLEANFILES = $(TEST_CLEAN) crc32-tab.c unihash-global.c
 DISTCLEANFILES = libtool
 EXTRA_DIST = \
 CLEANFILES = $(TEST_CLEAN) crc32-tab.c unihash-global.c
 DISTCLEANFILES = libtool
 EXTRA_DIST = \

-       $(TEST_DIST) maninst \
+       $(TEST_DIST) config/maninst \

        debian/rules debian/copyright debian/control debian/changelog
 
 ##----- That's all, folks ---------------------------------------------------
        debian/rules debian/copyright debian/control debian/changelog
 
 ##----- That's all, folks ---------------------------------------------------

diff --git a/configure.in b/configure.in
index 6e250ba304cca50872c949f6be1d6d0b079eb1d4..528dafb74d0fa265478b4cf9f449017ebb197854 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -27,6 +27,7 @@ dnl Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 dnl MA 02111-1307, USA.
 
 AC_INIT(exc.c)
 dnl MA 02111-1307, USA.
 
 AC_INIT(exc.c)

+AC_CONFIG_AUX_DIR(config)

 AM_INIT_AUTOMAKE(mLib, 2.0.5)
 
 AC_PROG_CC
 AM_INIT_AUTOMAKE(mLib, 2.0.5)
 
 AC_PROG_CC

diff --git a/man/Makefile.am b/man/Makefile.am
index 397f4c1f25cdedbd706b4d1ee4a60c1bd05c940e..3c33ffb4a9097d1be5037f0e55571353f032e866 100644 (file)
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -46,21 +46,21 @@ MANPAGESEXT = \
 install-man: $(MANPAGES)
        @$(NORMAL_INSTALL)
        $(mkinstalldirs) $(DESTDIR)$(mandir)
 install-man: $(MANPAGES)
        @$(NORMAL_INSTALL)
        $(mkinstalldirs) $(DESTDIR)$(mandir)

-       $(top_srcdir)/maninst \
+       $(top_srcdir)/config/maninst \

                -d $(DESTDIR)$(mandir) -s $(srcdir) \
                -i "$(INSTALL)" \
                install $(MANPAGES)
                -d $(DESTDIR)$(mandir) -s $(srcdir) \
                -i "$(INSTALL)" \
                install $(MANPAGES)

-       $(top_srcdir)/maninst \
+       $(top_srcdir)/config/maninst \

                -d $(DESTDIR)$(mandir) -s $(srcdir) \
                -i "$(INSTALL)" -e $(manext) \
                install $(MANPAGESEXT)
 
 uninstall-man: $(MANPAGS)
        @$(NORMAL_UNINSTALL)
                -d $(DESTDIR)$(mandir) -s $(srcdir) \
                -i "$(INSTALL)" -e $(manext) \
                install $(MANPAGESEXT)
 
 uninstall-man: $(MANPAGS)
        @$(NORMAL_UNINSTALL)

-       $(top_srcdir)/maninst \
+       $(top_srcdir)/config/maninst \

                -d $(DESTDIR)$(mandir) -s $(srcdir) \
                uninstall $(MANPAGES)
                -d $(DESTDIR)$(mandir) -s $(srcdir) \
                uninstall $(MANPAGES)

-       $(top_srcdir)/maninst \
+       $(top_srcdir)/config/maninst \

                -d $(DESTDIR)$(mandir) -s $(srcdir) -e $(manext) \
                uninstall $(MANPAGESEXT)
 
                -d $(DESTDIR)$(mandir) -s $(srcdir) -e $(manext) \
                uninstall $(MANPAGESEXT)