Fix the build (porting to EMI, example and clean stage).

diff --git a/org.glite.px.proxyrenewal/Makefile b/org.glite.px.proxyrenewal/Makefile
index ffc5757..f141a67 100644 (file)
--- a/org.glite.px.proxyrenewal/Makefile
+++ b/org.glite.px.proxyrenewal/Makefile
@@ -153,7 +153,7 @@ ${THRLIBOBJ} ${LIB_CORE_THR_OBJS}: %.thr.o: %.c
        ${COMPILE} ${MYPROXY_THR_INC} ${GLOBUS_THR_INC} -o $@ -c $<
 
 %.o: %.c
-       ${COMPILE} ${MYPROXY_CFLAGS} ${GLOBUS_GSSAPI_GSI_CFLAGS} -c $<
+       ${COMPILE} ${MYPROXY_CFLAGS} ${GLOBUS_GSSAPI_GSI_CFLAGS} -DLOCAL_PX_COMPILE=1 -c $<
 
 ${EXAMPLES}: %: %.o
        ${LINK} -o $@ $< ${default_libcore}

diff --git a/org.glite.px.proxyrenewal/examples/renew_core.c b/org.glite.px.proxyrenewal/examples/renew_core.c
index e0ba537..a446830 100644 (file)
--- a/org.glite.px.proxyrenewal/examples/renew_core.c
+++ b/org.glite.px.proxyrenewal/examples/renew_core.c
@@ -19,7 +19,11 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <getopt.h>
+#ifdef LOCAL_PX_COMPILE
+#include "renewal_core.h"
+#else
 #include <glite/security/proxyrenewal/renewal_core.h>
+#endif
 
 static struct option const long_options[] = {
    { "server",   required_argument, 0, 's' },

diff --git a/org.glite.px.proxyrenewal/src/renewd_locl.h b/org.glite.px.proxyrenewal/src/renewd_locl.h
index bf0bff5..f9ce31e 100644 (file)
--- a/org.glite.px.proxyrenewal/src/renewd_locl.h
+++ b/org.glite.px.proxyrenewal/src/renewd_locl.h
@@ -25,7 +25,7 @@
 #include <globus_gsi_proxy.h>
 #include <globus_gsi_cert_utils_constants.h>
 
-#include <glite/security/voms/voms_apic.h>
+#include <voms/voms_apic.h>
 
 #include "renewal.h"
 #include "renewal_core.h"