Nicer libtool/g++ hack (was collision with . in PATH).

diff --git a/org.glite.security.gsoap-plugin/Makefile b/org.glite.security.gsoap-plugin/Makefile
index c8b0abb..e04790d 100644 (file)
--- a/org.glite.security.gsoap-plugin/Makefile
+++ b/org.glite.security.gsoap-plugin/Makefile
@@ -71,7 +71,7 @@ LDFLAGS:=${COVERAGE_FLAGS}
 COMPILE:=libtool --mode=compile ${CC} ${CFLAGS}
 COMPILEXX:=libtool --mode=compile ${CXX} ${CFLAGS}
 LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/lib ${LDFLAGS} 
-LINKXX:=libtool --mode=link ${CXX} -rpath ${stagedir}/lib ${LDFLAGS}
+LINKXX:=PATH=${top_srcdir}/project/libtoolhack:${PATH} libtool --mode=link ${CXX} -rpath ${stagedir}/lib ${LDFLAGS}
 INSTALL:=libtool --mode=install install
 
 GLOBUS_INC:= -I${globus_prefix}/include/${nothrflavour}
@@ -167,15 +167,11 @@ ${LTLIB_S}: ${OBJS_S}
 ${THRLTLIB_S}: ${THROBJS_S}
        PATH=${top_builddir}:${PATH} ${LINKXX} ${version_info} -o $@ ${THRLOBJS_S} ${EX_THRLIBS}
 
-all compile: libtool-hack \
+all compile: \
        ${GSS_STATICLIB} ${GSS_LTLIB} ${GSS_THRSTATICLIB} ${GSS_THRLTLIB} \
        ${STATICLIB} ${LTLIB} ${THRSTATICLIB} ${THRLTLIB} \
        all-libs-with-soap examples
 
-libtool-hack:
-       echo 'g++ $$@' > gcc
-       chmod +x gcc
-
 check: compile check.gss
 
 check.gss: test_gss

diff --git a/org.glite.security.gsoap-plugin/project/libtoolhack/gcc b/org.glite.security.gsoap-plugin/project/libtoolhack/gcc
new file mode 100644 (file)
index 0000000..32933cd
--- /dev/null
+++ b/org.glite.security.gsoap-plugin/project/libtoolhack/gcc
@@ -0,0 +1 @@
+g++ "$@"