From e57e2b62e774ced2ee062715c2e3f1d444895b06 Mon Sep 17 00:00:00 2001 Message-Id: From: Mark Wooding Date: Fri, 26 Dec 2008 18:11:57 +0000 Subject: [PATCH] Build: Put build utilities in the config/ subdirectory. Organization: Straylight/Edgeware From: Mark Wooding 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. --- .gitignore | 13 +------------ .links | 3 +-- Makefile.am | 2 +- configure.in | 1 + man/Makefile.am | 8 ++++---- 5 files changed, 8 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index f826860..7107b05 100644 --- a/.gitignore +++ b/.gitignore @@ -1,23 +1,12 @@ Makefile.in aclocal.m4 -build configure -deb-build -deb-noadns +config COPYING.LIB COPYING config.guess config.sub install-sh -lib-config.in -ltmain.sh -maninst mdwopt.c mdwopt.h -missing -mkinstalldirs autom4te.cache -unihash.in -depcomp -compile - diff --git a/.links b/.links index 4aacfeb..f37dca9 100644 --- a/.links +++ b/.links @@ -1,5 +1,4 @@ -lib-config.in -maninst +config/maninst mdwopt.c mdwopt.h COPYING diff --git a/Makefile.am b/Makefile.am index c559b29..131a94c 100644 --- 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 = \ - $(TEST_DIST) maninst \ + $(TEST_DIST) config/maninst \ debian/rules debian/copyright debian/control debian/changelog ##----- That's all, folks --------------------------------------------------- diff --git a/configure.in b/configure.in index 6e250ba..528dafb 100644 --- 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) +AC_CONFIG_AUX_DIR(config) AM_INIT_AUTOMAKE(mLib, 2.0.5) AC_PROG_CC diff --git a/man/Makefile.am b/man/Makefile.am index 397f4c1..3c33ffb 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -46,21 +46,21 @@ MANPAGESEXT = \ install-man: $(MANPAGES) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(mandir) - $(top_srcdir)/maninst \ + $(top_srcdir)/config/maninst \ -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) - $(top_srcdir)/maninst \ + $(top_srcdir)/config/maninst \ -d $(DESTDIR)$(mandir) -s $(srcdir) \ uninstall $(MANPAGES) - $(top_srcdir)/maninst \ + $(top_srcdir)/config/maninst \ -d $(DESTDIR)$(mandir) -s $(srcdir) -e $(manext) \ uninstall $(MANPAGESEXT) -- [mdw]