From c736a719f11a4c0ac8a57a41e5f7ce05f6ca715f Mon Sep 17 00:00:00 2001
From: Marty Kuhrt <marty@kuhrt.net>
Date: Fri, 8 Apr 2005 05:06:31 +0000
Subject: [PATCH] fixed control_y trap problem

---
 packages/vms/build_vms.com | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/packages/vms/build_vms.com b/packages/vms/build_vms.com
index 853ad263c..7de9e5f98 100755
--- a/packages/vms/build_vms.com
+++ b/packages/vms/build_vms.com
@@ -43,6 +43,7 @@ $!  8-FEB-2005, MSK, merged the two config-vms.h* files into one that uses
 $!                   USE_SSLEAY to define if the target has SSL support built
 $!                   in.  Changed the cc/define parameter accordingly.
 $! 11-FEB-2005, MSK, If [--.LIB]AMIGAOS.C and NWLIB.C are there, rename them
+$! 23-MAR-2005, MSK, relocated cc_qual define so that DEBUG option would work
 $!
 $ on control_y then goto Common_Exit
 $ ctrl_y  = 1556 
@@ -71,18 +72,11 @@ $       @'defines'
 $    endif
 $ endif
 $ set def 'thisdir'
-$ cc_qual = "/define=HAVE_CONFIG_H=1/OBJ=OBJDIR:"
-$ link_qual = ""
-$ if p1 .eqs. "LISTING" then cc_qual = cc_qual + "/LIST/MACHINE"
-$ if p1 .eqs. "DEBUG" 
-$ then 
-$    cc_qual = cc_qual + "/LIST/MACHINE/DEBUG/NOOPT"
-$    link_qual = "/DEBUG"
-$ endif
-$ msg_qual = "/OBJ=OBJDIR:"
 $!
 $ hpssl   = 0
 $ openssl = 0
+$ cc_qual = "/define=HAVE_CONFIG_H=1/OBJ=OBJDIR:"
+$ link_qual = ""
 $ if f$trnlnm( "CURL_BUILD_NOSSL") .eqs. ""
 $ then
 $    if f$trnlnm( "OPENSSL") .nes. "" 
@@ -95,6 +89,13 @@ $       then hpssl = 1
 $       endif
 $    endif
 $ endif
+$ if p1 .eqs. "LISTING" then cc_qual = cc_qual + "/LIST/MACHINE"
+$ if p1 .eqs. "DEBUG" 
+$ then 
+$    cc_qual = cc_qual + "/LIST/MACHINE/DEBUG/NOOPT"
+$    link_qual = "/DEBUG"
+$ endif
+$ msg_qual = "/OBJ=OBJDIR:"
 $!
 $! Put the right main config file in the two source directories for the build.
 $!
@@ -166,8 +167,8 @@ $! the directory passed in via P1 and put it in the object library named
 $! via P3
 $!
 $build:   subroutine
-$ on control_y then return ctrl_y ! SS$_CONTROLY
-$ set noon
+$ on control_y then goto EndLoop ! SS$_CONTROLY
+$! set noon
 $   set default 'p1'
 $   search = p2
 $   reset = f$search("reset")
@@ -200,7 +201,6 @@ $      endif
 $   goto Loop
 $EndLoop:
 $   !purge
-$   on control_y then return ctrl_y ! SS$_CONTROLY
 $   set def 'origdir'
 $   endsubroutine   ! Build
 $!
@@ -209,7 +209,7 @@ $! Only C and MSG supported.
 $!
 $compile:   subroutine
 $   on control_y then return ctrl_y ! SS$_CONTROLY
-$   set noon
+$!   set noon
 $   file = p1
 $   qual = p2+p3+p4+p5+p6+p7+p8
 $   typ = f$parse(file,,,"TYPE") - "."
@@ -218,7 +218,6 @@ $   cmd_msg = "MESSAGE "+msg_qual
 $   x = cmd_'typ'
 $   'vo_c' x," ",file
 $   'x' 'file'
-$   on control_y then return ctrl_y ! SS$_CONTROLY
 $   ENDSUBROUTINE   ! Compile
 $!
 $! Do a diff of the file specified in P1 with that in P2.  If different