From: basney <basney>
Date: Sat, 29 Nov 2008 18:37:23 +0000 (+0000)
Subject: It turns out that whitespace is very significant in GPT Build_Steps.
X-Git-Tag: OPENSSH_5_2P1_GSSAPI_20090225_GPT-premerge
X-Git-Url: http://andersk.mit.edu/gitweb/gssapi-openssh.git/commitdiff_plain/0400944949b1e668235774778642b08f983a5947

It turns out that whitespace is very significant in GPT Build_Steps.
An extra newline at the end will cause the exit status from the
previous line to be dropped. So, I removed newlines after the
significant command in each Build_Step.
See: http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6544
---

diff --git a/openssh/pkg_data_src.gpt b/openssh/pkg_data_src.gpt
index 297bacb..57d6866 100644
--- a/openssh/pkg_data_src.gpt
+++ b/openssh/pkg_data_src.gpt
@@ -61,24 +61,16 @@
 
       <Build_Step>
         GSICFG="--prefix=INSTALLDIR_GPTMACRO --with-globus=INSTALLDIR_GPTMACRO --with-globus-flavor=FLAVOR_GPTMACRO --disable-strip"
-
         if test "STATIC_LINK_GPTMACRO" = "yes"; then 
           GSICFG="$GSICFG --with-globus-static"
         fi
+        GLOBUS_FLAVOR_NAME=FLAVOR_GPTMACRO
+        export GLOBUS_FLAVOR_NAME
+        CONFIGENV_GPTMACRO ./configure $GSI_OPENSSH_ARGS GSI_OPENSSH_GPTMACRO $GSICFG</Build_Step>
 
-	GLOBUS_FLAVOR_NAME=FLAVOR_GPTMACRO
-	export GLOBUS_FLAVOR_NAME
-
-        CONFIGENV_GPTMACRO ./configure $GSI_OPENSSH_ARGS GSI_OPENSSH_GPTMACRO $GSICFG
-      </Build_Step>
+      <Build_Step>MAKE_GPTMACRO gpt-all</Build_Step>
 
-      <Build_Step>
-        MAKE_GPTMACRO gpt-all
-      </Build_Step>
-
-      <Build_Step>
-        MAKE_GPTMACRO gpt-install
-      </Build_Step>
+      <Build_Step>MAKE_GPTMACRO gpt-install</Build_Step>
 
     </Build_Instructions>