Revert "Update to 7.40.1"

[platform/upstream/curl.git] / packages / vms / build_vms.com

diff --git a/packages/vms/build_vms.com b/packages/vms/build_vms.com
index d7edc46..97c305d 100644 (file)
--- a/packages/vms/build_vms.com
+++ b/packages/vms/build_vms.com
@@ -148,9 +148,6 @@ $!                      * 3 spaces after $ for second level.  Line start + 4.
 $!                      * 7 spaces after $ for third level.  Line start + 8.
 $!                      * Each level after that indents 4 characters.
 $!                      * then/else/endif same indentation as if statement.
-$! 17-Nov-2014, Michael Steve
-$!                   Modified build to handle new location of the VTLS lib
-$!                   source within zip archive. Not a pretty fix.
 $!
 $!===========================================================================
 $!
@@ -680,6 +677,8 @@ $! Form CC qualifiers.
 $!
 $ cc_defs = "/define = (''cc_defs')"
 $ cc_qual2 = cc_qual2 + " /object = ''objdir'"
+$ cc_qual2 = cc_qual2 + " /include = ([-.lib], [-.src],"
+$ cc_qual2 = cc_qual2 + " [-.packages.vms], [-.packages.vms.''arch_name'])"
 $ cc_qual2 = cc_qual2 + "/nested_include_directory=none"
 $!
 $ 'vo_c' "CC opts:", -
@@ -807,6 +806,7 @@ $!   set nover
 $ endif
 $!
 $!
+$!
 $ on control_y then goto Common_Exit
 $!
 $ set default 'proc_dev_dir'
@@ -819,21 +819,10 @@ $ if curl_sys_zlibinc .nes. ""
 $ then
 $   sys_inc = sys_inc + ",''curl_sys_zlibinc'"
 $ endif
-$! Build LIB
-$ cc_include = "/include=([-.lib],[-.lib.vtls],[-.packages.vms]"
-$ cc_include = cc_include + ",[-.packages.vms.''arch_name'])"
 $ call build "[--.lib]" "*.c" "''objdir'CURLLIB.OLB" "amigaos, nwlib, nwos"
 $ if ($status .eq. ctrl_y) then goto Common_Exit
-$! Build VTLS
-$ cc_include = "/include=([--.lib.vtls],[--.lib],[--.src]"
-$ cc_include = cc_include + ",[--.packages.vms],[--.packages.vms.''arch_name'])"
-$ call build "[--.lib.vtls]" "*.c" "''objdir'CURLLIB.OLB" "amigaos, nwlib, nwos"
-$! Build SRC
-$ cc_include = "/include=([-.src],[-.lib],[-.lib.vtls]"
-$ cc_include = cc_include + ",[-.packages.vms],[-.packages.vms.''arch_name'])"
 $ call build "[--.src]" "*.c" "''objdir'CURLSRC.OLB"
 $ if ($status .eq. ctrl_y) then goto Common_Exit
-$! Build MSG
 $ call build "[]" "*.msg" "''objdir'CURLSRC.OLB"
 $ if ($status .eq. ctrl_y) then goto Common_Exit
 $!
@@ -931,7 +920,7 @@ $   on control_y then goto EndLoop ! SS$_CONTROLY
 $   sts = 1 ! SS$_NORMAL.
 $!   set noon
 $   set default 'p1'
-$   search = "sys$disk:" + p2
+$   search = p2
 $   reset = f$search("reset")
 $   if f$search( p3) .eqs. ""
 $   then
@@ -1005,7 +994,6 @@ $       define/user decc$system_include 'sys_inc'
 $       CC 'cc_defs' -
          'cc_qual1' -
          'cc_qual2' -
-         'cc_include' -
          'file'
 $   else
 $       cmd_msg = "MESSAGE " + msg_qual