summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-12-19 15:39:39 +0000
committerlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-12-19 15:39:39 +0000
commit9a36a1590b03d2d1f0cd5925e8ecd229c873c54f (patch)
treeb827716b6dabb0c87b5118dc49a0a7c6d003fb6c
parent5b5162ceb6d435183bdc583f2dcba796a11e2959 (diff)
downloadATCD-9a36a1590b03d2d1f0cd5925e8ecd229c873c54f.tar.gz
ChangeLogTag: Sun Dec 19 09:34:49 1999 David L. Levine <levine@cs.wustl.edu>
-rw-r--r--ChangeLog-99b14
-rwxr-xr-xbin/g++dep13
2 files changed, 12 insertions, 15 deletions
diff --git a/ChangeLog-99b b/ChangeLog-99b
index 114eb7c79c6..2919d5e4321 100644
--- a/ChangeLog-99b
+++ b/ChangeLog-99b
@@ -1,9 +1,15 @@
+Sun Dec 19 09:34:49 1999 David L. Levine <levine@cs.wustl.edu>
+
+ * bin/g++dep: set TAO_ROOT to $ACE_ROOT/TAO if it was
+ unset. Thanks to Darrell for reporting that TAO_ROOT
+ wasn't being substituted if it wasn't set.
+
Sat Dec 18 01:16:20 1999 Irfan Pyarali <irfan@cs.wustl.edu>
- * ace/ACE.cpp (recv_i and send_i): The selection of the next
- message block to send/recv was incorrect. The correct way is to
- chase the continuation chain and then go to the next
- continuation chain.
+ * ace/ACE.cpp (recv_i and send_i): The selection of the next
+ message block to send/recv was incorrect. The correct way is to
+ chase the continuation chain and then go to the next
+ continuation chain.
Fri Dec 17 22:25:56 1999 David L. Levine <levine@cs.wustl.edu>
diff --git a/bin/g++dep b/bin/g++dep
index a0f8e567160..823d29b0776 100755
--- a/bin/g++dep
+++ b/bin/g++dep
@@ -39,21 +39,12 @@ case $1 in
# -r allows the use of relative pathnames...
-r) REL="-e s;$ACE_ROOT;\$(ACE_ROOT);g ${ACE_DEPEND_SED_CMD}"
- if [ ${TAO_ROOT:-no_tao_root} = "no_tao_root" ]; then
- echo no TAO_ROOT
- else
- REL="-e s;$TAO_ROOT;\$(TAO_ROOT);g "$REL
- echo REL=$REL
- fi
+ REL="-e s;${TAO_ROOT:=$ACE_ROOT/TAO};\$(TAO_ROOT);g "$REL
shift ;;
# -A uses relative pathnames and fixes the .obj line
# and it implies -r
-A) REL="-e s;$ACE_ROOT;\$(ACE_ROOT);g ${ACE_DEPEND_SED_CMD}"
- if [ ${TAO_ROOT:-no_tao_root} = "no_tao_root" ]; then
- echo no TAO_ROOT
- else
- REL="-e s;$TAO_ROOT;\$(TAO_ROOT);g "$REL
- fi
+ REL="-e s;${TAO_ROOT:=$ACE_ROOT/TAO};\$(TAO_ROOT);g "$REL
DO_ACE_MAKE_DEPEND=1
shift ;;
*) STOPNOW=1