diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2003-01-08 17:11:41 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2003-01-08 17:11:41 +0000 |
| commit | 0b33b70f7b6f138cfb8009d33d105efa1b378fe6 (patch) | |
| tree | f4b21a49bc36f5f3fb9818af31f5982f96964aff | |
| parent | c9a6a993043cfb493fc5b4a334529e7a12030f40 (diff) | |
| download | ATCD-0b33b70f7b6f138cfb8009d33d105efa1b378fe6.tar.gz | |
ChangeLogTag: Wed Jan 8 12:17:10 2003 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 6 | ||||
| -rwxr-xr-x | bin/ace-install | 6 |
3 files changed, 15 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 7aacfddcd85..6a988f87fe5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Jan 8 12:17:10 2003 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> + + * bin/ace-install: Fixed the improper usage of "or" in the "find " + command used to find the inlined files with extensions .i and + .inl. Thanks to Oliver Kellog for providing the patch. + Tue Jan 7 13:08:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> * ACEXML/common/Makefile: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 7aacfddcd85..6a988f87fe5 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,9 @@ +Wed Jan 8 12:17:10 2003 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> + + * bin/ace-install: Fixed the improper usage of "or" in the "find " + command used to find the inlined files with extensions .i and + .inl. Thanks to Oliver Kellog for providing the patch. + Tue Jan 7 13:08:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> * ACEXML/common/Makefile: diff --git a/bin/ace-install b/bin/ace-install index 52a566cb8ba..f54429497d8 100755 --- a/bin/ace-install +++ b/bin/ace-install @@ -428,7 +428,7 @@ if [ $install -ne 0 ]; then find tao -type f -name "*.idl" -print | cpio -p -d -V $TAO_DIR/include find tao -type f -name "*.pidl" -print | cpio -p -d -V $TAO_DIR/include find tao -type f -name "*.h" -print | grep -v "^config\.h" | cpio -p -d -V $TAO_DIR/include - find tao -type f -name "*.i" -o -name "*.inl" -print | cpio -p -d -V $TAO_DIR/include + find tao -type f \( -name "*.i" -o -name "*.inl" \) -print | cpio -p -d -V $TAO_DIR/include find tao -type f -name "*.cpp" -print | cpio -p -d -V $TAO_DIR/include # NOTE: may need all .h, .i and .cpp under TAO/orbsvcs, instead of just TAO/orbsvcs/orbsvcs @@ -436,7 +436,7 @@ if [ $install -ne 0 ]; then find orbsvcs -type f -name "*.idl" -print | cpio -p -d -V $TAO_DIR/include find orbsvcs -type f -name "*.pidl" -print | cpio -p -d -V $TAO_DIR/include find orbsvcs -type f -name "*.h" -print | grep -v "^config\.h" | cpio -p -d -V $TAO_DIR/include - find orbsvcs -type f -name "*.i" -o -name "*.inl" -print | cpio -p -d -V $TAO_DIR/include + find orbsvcs -type f \( -name "*.i" -o -name "*.inl" \) -print | cpio -p -d -V $TAO_DIR/include find orbsvcs -type f -name "*.cpp" -print | cpio -p -d -V $TAO_DIR/include cd .. @@ -467,7 +467,7 @@ if [ $install -ne 0 ]; then # copy ACE includes echo "Copying include files..." find ace -type f -name "*.h" -print | grep -v "^config\.h" | cpio -p -d -V $ACE_DIR/include - find ace -type f -name "*.i" -o -name "*.inl" -print | cpio -p -d -V $ACE_DIR/include + find ace -type f \( -name "*.i" -o -name "*.inl" \) -print | cpio -p -d -V $ACE_DIR/include find ace -type f -name "*.cpp" -print | cpio -p -d -V $ACE_DIR/include cp ace/config.h $ACE_DIR/$ACE_ARCH/include/ace/config.h && rm $ACE_DIR/include/ace/config.h |