From 2b92ec159234ae3de8fdd277747bb8fe4309be15 Mon Sep 17 00:00:00 2001 From: Tim Van Holder Date: Sat, 21 Jul 2001 09:57:08 +0000 Subject: [PATCH] * automake.in (handle_single_transform_list): Use $(DEPDIR) instead of hardcoding '.deps'. * m4/depend.m4 (AM_SET_DEPDIR): Sync with libtool's libdir check. --- ChangeLog | 6 ++++++ automake.in | 2 +- m4/depend.m4 | 9 +++++---- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 77cc721c..25b4bf9b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-07-21 Tim Van Holder + + * automake.in (handle_single_transform_list): Use $(DEPDIR) + instead of hardcoding '.deps'. + * m4/depend.m4 (AM_SET_DEPDIR): Sync with libtool's libdir check. + 2001-07-20 Derek Price * m4/header.m4 (AM_CONFIG_HEADER): Create stamp-h files in the correct diff --git a/automake.in b/automake.in index f5b44435..fc52d420 100755 --- a/automake.in +++ b/automake.in @@ -2006,7 +2006,7 @@ sub handle_single_transform_list ($$$@) # If we're generating dependencies, we also want # to make sure that the appropriate subdir of the # .deps directory is created. - push (@dep_list, &require_build_directory (".deps/$directory")) + push (@dep_list, &require_build_directory ('$(DEPDIR)/' . $directory)) if ($use_dependencies); } diff --git a/m4/depend.m4 b/m4/depend.m4 index c57c2e96..10600484 100644 --- a/m4/depend.m4 +++ b/m4/depend.m4 @@ -98,14 +98,15 @@ AC_SUBST([$1DEPMODE]) # Choose a directory name for dependency files. # This macro is AC_REQUIREd in _AM_DEPENDENCIES AC_DEFUN([AM_SET_DEPDIR], -[if test -d .deps || mkdir .deps 2> /dev/null || test -d .deps; then +[rm -f .deps 2>/dev/null +mkdir .deps 2>/dev/null +if test -d .deps; then DEPDIR=.deps - # We redirect because .deps might already exist and be populated. - # In this situation we don't want to see an error. - rmdir .deps > /dev/null 2>&1 else + # MS-DOS does not allow filenames that begin with a dot. DEPDIR=_deps fi +rmdir .deps 2>/dev/null AC_SUBST(DEPDIR) ]) -- 2.43.5