summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2006-11-23 14:11:17 +0000
committerSteve Huston <shuston@riverace.com>2006-11-23 14:11:17 +0000
commitab978a9cbb7101521b8fad0638e826192967190b (patch)
tree0ca564e36e77959261d4f7d0fd5f87030822d2f6
parent6059c08843ffa8a90ed4d56f2a0923c06df6a06c (diff)
downloadATCD-ab978a9cbb7101521b8fad0638e826192967190b.tar.gz
ChangeLogTag:Thu Nov 23 14:09:17 UTC 2006 Steve Huston <shuston@riverace.com>
-rw-r--r--ACE/ChangeLog5
-rw-r--r--ACE/include/makeinclude/rules.lib.GNU4
2 files changed, 7 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 47207f6dcdc..1baba868ea6 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,8 @@
+Thu Nov 23 14:09:17 UTC 2006 Steve Huston <shuston@riverace.com>
+
+ * include/makeinclude/rules.lib.GNU: Corrected error introduced by
+ Wed Nov 22 21:53:17 UTC 2006 Steve Huston <shuston@riverace.com>.
+
Thu Nov 23 06:53:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
* bin/MakeProjectCreator/config/ace_for_tao.mpb:
diff --git a/ACE/include/makeinclude/rules.lib.GNU b/ACE/include/makeinclude/rules.lib.GNU
index 65c472ad973..2b0ded6127f 100644
--- a/ACE/include/makeinclude/rules.lib.GNU
+++ b/ACE/include/makeinclude/rules.lib.GNU
@@ -79,12 +79,12 @@ else # VLIBS
endif # IDL_SRC
endif # !VLIBS
-VLOBJS = $(addprefix $(VDIR),$(foreach var, $(addsuffix .$(OBJEXT), $(basename $(LSRC)) $(RESOURCES)), $(patsubst ../%,$(notdir %),$(var))))
+VLOBJS = $(addprefix $(VDIR),$(foreach var, $(addsuffix .$(OBJEXT), $(basename $(LSRC)) $(RESOURCES)), $(patsubst ../%,$(notdir $(var)),$(var))))
ifdef LSRC2
LSRC += $(LSRC2)
endif
-VSHOBJS = $(addprefix $(VSHDIR),$(foreach var, $(addsuffix .$(OBJEXT), $(basename $(LSRC)) $(RESOURCES)), $(patsubst ../%,$(notdir %),$(var))))
+VSHOBJS = $(addprefix $(VSHDIR),$(foreach var, $(addsuffix .$(OBJEXT), $(basename $(LSRC)) $(RESOURCES)), $(patsubst ../%,$(notdir $(var)),$(var))))
ifneq ($(IDL_SRC),)
$(VLOBJS) $(VSHOBJS): $(IDL_SRC)