diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | configure.in | 4 |
3 files changed, 13 insertions, 7 deletions
@@ -1,3 +1,13 @@ +1998-04-02 Gordon Matzigkeit <gord@profitpress.com> + + * Makefile (srcdir): Don't set srcdir, since this is either done + in the generated Makefile or in Makeconf. Just include ./Makeconf + directly. + + * configure.in (makefiles): Check for $ac_unique_file, rather than + doing string comparisons to determine if we are configured in the + source directory. This works for silly things like `srcdir=./.'. + 1997-08-06 Miles Bader <miles@gnu.ai.mit.edu> * Makefile (prog-subdirs): Add ftpfs. @@ -18,11 +18,7 @@ dir := . makemode := misc -ifndef srcdir -srcdir = . -endif - -include $(srcdir)/Makeconf +include ./Makeconf DIST_FILES = COPYING Makeconf config.make.in configure.in configure \ hurd.boot build.mk.in build.mkcf.in aclocal.m4 \ diff --git a/configure.in b/configure.in index 8f55c4c1..ff28fde5 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_REVISION([$Id: configure.in,v 1.11 1997/05/23 16:39:25 thomas Exp $]) +AC_REVISION([$Id: configure.in,v 1.12 1998/04/23 00:52:19 tb Exp $]) AC_PREREQ(2.4) dnl Minimum Autoconf version required. AC_INIT(hurd/hurd_types.h) dnl A distinctive file to look for in srcdir. @@ -48,7 +48,7 @@ LIBS="$LIBCRYPT $LIBS" AC_CHECK_FUNCS(crypt) LIBS="$_SAVE_LIBS" -if test $srcdir = .; then +if test -f ./$ac_unique_file; then # Configuring in source directory; don't create any Makefiles. makefiles= else |