ChangeLogTag:Mon Dec 20 23:55:18 1999 Ossama Othman

<othman@cs.wustl.edu>

2 files changed, 12 insertions, 9 deletions

diff --git a/Makefile b/Makefile
index cf36369edde..b56bb12fa6d 100644
--- a/Makefile
+++ b/Makefile
@@ -198,8 +198,7 @@ REL                = beta
 ZIP_FILES          =
 
 #### The release target creates the ACE (only) kit.
-release: $(APPLY_NEW_TAG)
-	@$(ACE_ROOT)/bin/bootstrap workspace  # Temporary ACE+autoconf hack.
+release: $(APPLY_NEW_TAG
 	@$(ACE_ROOT)/bin/make_release -k ace $(ACE_TAG) \
          $(INSTALL_KIT) $(GENERATE_MAN_PAGES) $(ZIP_FILES) $(CHECK)
 
@@ -220,7 +219,6 @@ releasetao:
 ####      The make then recursively invokes make releasetao in this
 ####      directory to create the combined ACE-TAO kit.
 releaseall: $(APPLY_NEW_TAG)
-	@$(ACE_ROOT)/bin/bootstrap  # Temporary ACE+autoconf hack.
 	@cd TAO  &&  $(MAKE) -s release REL=$(REL)
 
 .PHONY: show_controlled_files show_release_files show_release_lib_files
diff --git a/bin/make_release b/bin/make_release
index 621e9a8c8e2..8db038ab1a7 100755
--- a/bin/make_release
+++ b/bin/make_release
@@ -181,8 +181,8 @@ my $find = "${gnu}find";
 my $gzip = "${gnu}gzip";
 my $make = "${gnu}make -s";
 my $mv = '/bin/mv -f';
-my $rm = "${gnu}/rm -f";
-my $md5sum = '${gnu2}/md5sum';
+my $rm = "${gnu}rm -f";
+my $md5sum = "${gnu2}md5sum";
 chop (my $now = `$date +"%a %b %d %T %Y"`);
 
 unless ("$controlled_files") {
@@ -365,6 +365,7 @@ sub check_workspace () {
 
   if ($kit =~ /^ace/) {
     chdir 'ACE_wrappers'  ||  die "$0: unable to chdir ACE_wrappers\n";
+    &ex("bin/bootstrap");  ## Temporary ACE+autoconf hack.
   } elsif ($kit =~ /tao/) {
     chdir 'ACE_wrappers/TAO'  ||  die "$0: unable to chdir ACE_wrappers/TAO\n";
   }
@@ -617,6 +618,10 @@ sub create_kit () {
   my $build_command;
   my $archives;
 
+  ## Temporary ACE+autoconf hack to bootstrap autoconf support into
+  ## ACE distribution.
+  &ex("cd ACE_wrappers && bin/bootstrap");
+
   if ($kit eq 'ace'  ||  $kit eq 'ace+tao') {
     if ($create_zips) {
       $build_command =
@@ -636,7 +641,7 @@ sub create_kit () {
         "$chmod a+r ACE.tar.gz ACE-lib.tar.gz ACE.zip ACE-lib.zip && " .
         "$dispose ACE.zip ACE-lib.zip $dest &&" .
         "$dispose ACE.tar.gz ACE-lib.tar.gz $dest; ";
-      $archives = "ACE.tar.gz ACE-lib.tar.gz ACE.zip ACE-lib.zip";
+      $archives = " ACE.tar.gz ACE-lib.tar.gz ACE.zip ACE-lib.zip ";
     } else {
       $build_command = 
         "$find $release_files $release_filter | $cpio -o -H tar | " .
@@ -645,7 +650,7 @@ sub create_kit () {
           "$gzip -9 > ACE-lib.tar.gz && " .
         "$chmod a+r ACE.tar.gz ACE-lib.tar.gz && " .
         "$dispose ACE.tar.gz ACE-lib.tar.gz $dest; ";
-      $archives = "ACE.tar.gz ACE-lib.tar.gz";
+      $archives = " ACE.tar.gz ACE-lib.tar.gz ";
     }
   }
   
@@ -663,14 +668,14 @@ sub create_kit () {
           "$gzip -9 > ACE+TAO.tar.gz && " .
         "$chmod a+r ACE+TAO.tar.gz ACE+TAO.zip && " .
         "$dispose ACE+TAO.tar.gz ACE+TAO.zip $dest";
-      $archives .= "ACE+TAO.tar.gz ACE+TAO.zip";
+      $archives .= " ACE+TAO.tar.gz ACE+TAO.zip ";
     } else {
       $build_command .= 
         "$find $release_files $release_filter | $cpio -o -H tar | " .
           "$gzip -9 > ACE+TAO.tar.gz && " .
         "$chmod a+r ACE+TAO.tar.gz && " .
         "$dispose ACE+TAO.tar.gz $dest";
-      $archives .= "ACE+TAO.tar.gz";
+      $archives .= " ACE+TAO.tar.gz ";
     }
   }