Miscellaneous attempts to fix broken setup package build.

diff --git a/setup/filelist b/setup/filelist
index bc8d2257b5486a62c411a77787eb2d1c23fbee42..78eafeb1fa364446313de608ffe66ef018099107 100644 (file)
--- a/setup/filelist
+++ b/setup/filelist
@@ -1,3 +1,2 @@
 setup/globus/setup-openssh
 setup/globus/setup-openssh.pl
-

diff --git a/setup/pkg_data_src.gpt b/setup/pkg_data_src.gpt
index e60a239294330e350689abcf66ab1b236895d195..1927ba9f7cc8113b110fcbeabf0bcdac03afc379 100644 (file)
--- a/setup/pkg_data_src.gpt
+++ b/setup/pkg_data_src.gpt
@@ -10,13 +10,19 @@
 
   <src_pkg >
 
+    <Source_Setup_Dependency PkgType="pgm" >
+      <Setup_Dependency Name="globus_core_setup" > <Version > <Simple_Version Major="0" /> </Version> </Setup_Dependency>
+    </Source_Setup_Dependency>
+
     <Version_Label>3.0.2p1</Version_Label>
 
+    <With_Flavors build="no" />
+
     <Build_Instructions>
 
       <COMMENT> what happens if INSTALLDIR_GPTMACRO/setup doesn't exist? </COMMENT>
-      <Build_Step>cp setup-openssh INSTALLDIR_GPTMACRO/setup/setup-openssh</Build_Step>
-      <Build_Step>cp setup-openssh.pl INSTALLDIR_GPTMACRO/setup/setup-openssh.pl</Build_Step>
+      <Build_Step>cp setup-openssh INSTALLDIR_GPTMACRO/setup/globus/setup-openssh</Build_Step>
+      <Build_Step>cp setup-openssh.pl INSTALLDIR_GPTMACRO/setup/globus/setup-openssh.pl</Build_Step>
 
     </Build_Instructions>