From: František Dvořák <valtri@civ.zcu.cz>
Date: Mon, 12 Feb 2007 19:32:18 +0000 (+0000)
Subject: The previous fix is colliding with src platform used in ETICS, preparing some solution.
X-Git-Tag: glite-security-gsoap-plugin_R_1_4_2_1~2
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=f315eca0f10140ee45ebf8bc6ba8ba43a34a1743;p=jra1mw.git

The previous fix is colliding with src platform used in ETICS, preparing some solution.
---

diff --git a/org.glite.security.gsoap-plugin/Makefile b/org.glite.security.gsoap-plugin/Makefile
index 8dbf697..2d58551 100644
--- a/org.glite.security.gsoap-plugin/Makefile
+++ b/org.glite.security.gsoap-plugin/Makefile
@@ -32,8 +32,13 @@ version_info:=-version-info ${shell \
 
 # version_info=-version-info `echo ${version} | cut -d. -f1,2 | tr . :`
 
+ext_repository:=${shell if [ -d "${repository}/externals" ]; then \
+	echo "${repository}/externals"; \
+	else echo "${repository}"; \
+	fi}
+gsoap_platform:=${shell echo "${gsoap_prefix}" | sed -e 's,.*\(rhel30_gcc.*\|slc3_.*_gcc[0-9]*\|src\).*,\1,'}
 gsoap_version=${gsoap_default_version}
-gsoap_prefix=${repository}/${gsoap_name}/${gsoap_version}/${gsoap_platform}
+gsoap_prefix=${ext_repository}/${gsoap_name}/${gsoap_version}/${gsoap_platform}
 
 VPATH=${top_srcdir}/src:${top_srcdir}/test:${top_srcdir}/examples
 
@@ -198,12 +203,14 @@ link-gsoap:
 	if [ -f ${top_srcdir}/src/stdsoap2_${gsoap_version}.c ]; then \
 		ln -sf ${top_srcdir}/src/stdsoap2_${gsoap_version}.c stdsoap2.c; \
 		ln -sf ${top_srcdir}/src/stdsoap2_${gsoap_version}.h stdsoap2.h; \
-	elif [ -f ${repository}/${gsoap_name}/${gsoap_version}/src/stdsoap2.c ]; then \
-		ln -sf ${repository}/${gsoap_name}/${gsoap_version}/src/stdsoap2.[ch] .; \
-	elif [ -f ${repository}/${gsoap_name}/${gsoap_version}/${gsoap_platform}/stdsoap2.c ]; then \
-		ln -sf ${repository}/${gsoap_name}/${gsoap_version}/${gsoap_platform}/stdsoap2.[ch] .; \
-	elif [ -f ${repository}/externals/${gsoap_name}/${gsoap_version}/src/${gsoap_srcname}/soapcpp2/stdsoap2.c ]; then \
-		ln -sf ${repository}/externals/${gsoap_name}/${gsoap_version}/src/${gsoap_srcname}/soapcpp2/stdsoap2.[ch] .; \
+	elif [ -f ${ext_repository}/${gsoap_name}/${gsoap_version}/src/stdsoap2.c ]; then \
+		ln -sf ${ext_repository}/${gsoap_name}/${gsoap_version}/src/stdsoap2.[ch] .; \
+	elif [ -f ${ext_repository}/${gsoap_name}/${gsoap_version}/${gsoap_platform}/stdsoap2.c ]; then \
+		ln -sf ${ext_repository}/${gsoap_name}/${gsoap_version}/${gsoap_platform}/stdsoap2.[ch] .; \
+	elif [ -f ${ext_repository}/${gsoap_name}/${gsoap_version}/src/stdsoap2.c ]; then \
+		ln -sf ${ext_repository}/externals/${gsoap_name}/${gsoap_version}/src/stdsoap2.[ch] .; \
+	elif [ -f ${exit_repository}/${gsoap_name}/${gsoap_version}/src/${gsoap_srcname}/soapcpp2/stdsoap2.c ]; then \
+		ln -sf ${ext_repository}/externals/${gsoap_name}/${gsoap_version}/src/${gsoap_srcname}/soapcpp2/stdsoap2.[ch] .; \
 	elif [ -f ${gsoap_prefix}/stdsoap2.c ]; then \
 		ln -sf ${gsoap_prefix}/stdsoap2.[ch] .; \
 	elif [ -f ${gsoap_prefix}/src/stdsoap2.c ]; then \