rse         99/11/28 03:36:54

  Modified:    src      CHANGES
               .        configure
  Log:
  Fix $AWK/awk usage in top-level configure script: We confused ourself and
  replaced the wrong "$AWK" with a plain "awk" in the last releases. So we now
  both fix this and move the comment which already tried to explain it more
  closer to the location to which it applies.
  
  Submitted by: Paul Gilmartin <[EMAIL PROTECTED]>
  Extended and reviewed by: Ralf S. Engelschall
  PR: 5304
  
  Revision  Changes    Path
  1.1450    +6 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1449
  retrieving revision 1.1450
  diff -u -r1.1449 -r1.1450
  --- CHANGES   1999/11/28 11:24:25     1.1449
  +++ CHANGES   1999/11/28 11:36:51     1.1450
  @@ -1,4 +1,10 @@
   Changes with Apache 1.3.10
  +
  +  *) Fix $AWK/awk usage in top-level configure script: We confused ourself 
and
  +     replaced the wrong "$AWK" with a plain "awk" in the last releases. So we
  +     now both fix this and move the comment which already tried to explain it
  +     more closer to the location to which it applies.
  +     [Paul Gilmartin <[EMAIL PROTECTED]>, Ralf S. Engelschall] PR#5304
    
     *) Replaced pipes with commas in GuessOS' fallback output (displayed for 
not
        explicitly recognized platforms) to avoid side-effects with APACI's
  
  
  
  1.109     +4 -4      apache-1.3/configure
  
  Index: configure
  ===================================================================
  RCS file: /home/cvs/apache-1.3/configure,v
  retrieving revision 1.108
  retrieving revision 1.109
  diff -u -r1.108 -r1.109
  --- configure 1999/11/28 11:17:57     1.108
  +++ configure 1999/11/28 11:36:53     1.109
  @@ -546,9 +546,7 @@
                       ;;
               esac
               #   determine GNU platform triple
  -            #   (the use of `awk' and not `$AWK' here is correct, because 
this
  -            #   Makefile is for platform bootstrapping, so don't hardcode 
paths)
  -            gnutriple=`$aux/GuessOS | sed -e 's:/:-:g' | awk '{ 
printf("%s",$1); }'`
  +            gnutriple=`$aux/GuessOS | sed -e 's:/:-:g' | $AWK '{ 
printf("%s",$1); }'`
               #   create Makefile wrapper (the first time only)
               if [ "x`ls $top/src.* 2>/dev/null`" = "x" ]; then
                   if [ "x$quiet" = "xno" ]; then
  @@ -563,7 +561,9 @@
                   else
                       echo "SHADOW=." >> Makefile
                   fi
  -                echo "GNUTRIPLE=\`$aux/GuessOS | sed -e 's:/:-:g' | $AWK '{ 
printf(\"%s\",\$\$1); }'\`" >> Makefile
  +                #   (the use of `awk' and not `$AWK' here is correct, 
because this
  +                #   Makefile is for platform bootstrapping, so don't 
hardcode paths)
  +                echo "GNUTRIPLE=\`$aux/GuessOS | sed -e 's:/:-:g' | awk '{ 
printf(\"%s\",\$\$1); }'\`" >> Makefile
                   echo "" >> Makefile
                   echo "all build install install-quiet clean distclean:" >> 
Makefile
                   echo "       @cd \$(SHADOW); \$(MAKE) -f 
Makefile.\$(GNUTRIPLE) \$(MFLAGS) \$@" >> Makefile
  
  
  

Reply via email to