From: František Dvořák <valtri@civ.zcu.cz>
Date: Mon, 3 Jan 2011 17:33:35 +0000 (+0000)
Subject: For myproxy prefer myproxy-essentials prefix (should fix glite build).
X-Git-Tag: merge_21_head_round2_dst~5
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=a46c8b90e3b7d2a3716688a4074b3d94b8576bad;p=jra1mw.git

For myproxy prefer myproxy-essentials prefix (should fix glite build).
---

diff --git a/org.glite.px.proxyrenewal/Makefile b/org.glite.px.proxyrenewal/Makefile
index a615f16..80c9e31 100644
--- a/org.glite.px.proxyrenewal/Makefile
+++ b/org.glite.px.proxyrenewal/Makefile
@@ -36,7 +36,6 @@ libdir=lib
 
 glite_location=${PREFIX}
 globus_prefix=/opt/globus
-myproxy_prefix=${globus_prefix}
 
 -include Makefile.inc
 
@@ -48,6 +47,9 @@ GLOBUS_NOTHR_LIBS:=-L${globus_prefix}/lib \
 	-lglobus_common_${nothrflavour} \
 	-lssl
 
+myproxy_prefix=${myproxy-essentials_prefix}
+myproxy_prefix?=${globus_prefix}
+
 MYPROXY_NOTHR_INC:= -I${myproxy_prefix}/include/${nothrflavour}
 MYPROXY_THR_INC:= -I${myproxy_prefix}/include/${thrflavour}