From afdca11f60d1c4982dcca7e78d3c4aa3b0fcbd9c Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 10 Jun 2005 16:16:33 +0000 Subject: [PATCH] If a directory doesn't exist, fail instead of doing infinite recursion. --- ChangeLog | 4 ++++ Makefile.in | 18 +++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3ba3ba3..f190248 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-06-10 Ralf Wildenhues + + * Makefile.in: Don't enter nonexisting directories. + 2005-05-17 Ralf Wildenhues Speed up the linking step diff --git a/Makefile.in b/Makefile.in index a3b43df..6e68da9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -30,47 +30,47 @@ INSTALL_DATA = @INSTALL_DATA@ SHELL = /bin/sh all : force - cd @subdir@; $(MAKE) all + cd @subdir@ && $(MAKE) all install : installdirs force - cd @subdir@; $(MAKE) install + cd @subdir@ && $(MAKE) install $(INSTALL_SCRIPT) cln-config $(DESTDIR)$(bindir)/cln-config $(INSTALL_DATA) cln-config.1 $(DESTDIR)$(mandir)/man1/cln-config.1 $(INSTALL_DATA) ${srcdir}/cln.m4 ${DESTDIR}${datadir}/aclocal/cln.m4 $(INSTALL_DATA) cln.pc $(DESTDIR)$(libdir)/pkgconfig/cln.pc installdirs : force - cd @subdir@; $(MAKE) installdirs + cd @subdir@ && $(MAKE) installdirs $(MKDIR) $(DESTDIR)$(mandir)/man1 $(MKDIR) $(DESTDIR)$(datadir)/aclocal $(MKDIR) $(DESTDIR)$(bindir) $(MKDIR) $(DESTDIR)$(libdir)/pkgconfig uninstall : force - cd @subdir@; $(MAKE) uninstall + cd @subdir@ && $(MAKE) uninstall $(RM) $(DESTDIR)$(bindir)/cln-config $(RM) $(DESTDIR)$(mandir)/man1/cln-config.1 $(RM) $(DESTDIR)$(datadir)/aclocal/cln.m4 $(RM) $(DESTDIR)$(libdir)/pkgconfig/cln.pc check : force - cd @subdir@; $(MAKE) check + cd @subdir@ && $(MAKE) check mostlyclean : force - cd @subdir@; $(MAKE) mostlyclean + cd @subdir@ && $(MAKE) mostlyclean clean : force - cd @subdir@; $(MAKE) clean + cd @subdir@ && $(MAKE) clean distclean : force - cd @subdir@; if test -f Makefile; then $(MAKE) distclean; fi + cd @subdir@ && if test -f Makefile; then $(MAKE) distclean; fi $(RM) config.status config.log config.cache Makefile $(RM) cln-config cln-config.1 cln.pc $(RM) libtool $(RM) include/cln/config.h include/cln/intparam.h include/cln/floatparam.h src/base/cl_base_config.h src/base/cl_gmpconfig.h src/float/cl_float_config.h src/timing/cl_t_config.h maintainer-clean : force - cd @subdir@; if test -f Makefile; then $(MAKE) maintainer-clean; fi + cd @subdir@ && if test -f Makefile; then $(MAKE) maintainer-clean; fi $(RM) config.status config.log config.cache Makefile $(RM) cln-config cln-config.1 cln.spec cln.pc $(RM) libtool