summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@redhat.com>1994-01-26 00:48:30 +0000
committerRoland McGrath <roland@redhat.com>1994-01-26 00:48:30 +0000
commitb5665419baa2ce98f7456c59a0850653922b27e9 (patch)
treea044b2d307d5be0fb032b1ccd214c72828571cd0
parent7f534ea59548127abc59e1ad61b9b2b895c7b780 (diff)
downloadgunmake-b5665419baa2ce98f7456c59a0850653922b27e9.tar.gz
Formerly variable.c.~26~
-rw-r--r--variable.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/variable.c b/variable.c
index de35602..e6f2c87 100644
--- a/variable.c
+++ b/variable.c
@@ -381,12 +381,12 @@ define_automatic_variables ()
/* Define the magic D and F variables in terms of
the automatic variables they are variations of. */
- define_variable ("@D", 2, "$(dir $@)", o_automatic, 1);
- define_variable ("%D", 2, "$(dir $%)", o_automatic, 1);
- define_variable ("*D", 2, "$(dir $*)", o_automatic, 1);
- define_variable ("<D", 2, "$(dir $<)", o_automatic, 1);
- define_variable ("?D", 2, "$(dir $?)", o_automatic, 1);
- define_variable ("^D", 2, "$(dir $^)", o_automatic, 1);
+ define_variable ("@D", 2, "$(patsubst %/,%,$(dir $@))", o_automatic, 1);
+ define_variable ("%D", 2, "$(patsubst %/,%,$(dir $%))", o_automatic, 1);
+ define_variable ("*D", 2, "$(patsubst %/,%,$(dir $*))", o_automatic, 1);
+ define_variable ("<D", 2, "$(patsubst %/,%,$(dir $<))", o_automatic, 1);
+ define_variable ("?D", 2, "$(patsubst %/,%,$(dir $?))", o_automatic, 1);
+ define_variable ("^D", 2, "$(patsubst %/,%,$(dir $^))", o_automatic, 1);
define_variable ("@F", 2, "$(notdir $@)", o_automatic, 1);
define_variable ("%F", 2, "$(notdir $%)", o_automatic, 1);
define_variable ("*F", 2, "$(notdir $*)", o_automatic, 1);