From 82efbafa290cc32bc9125b7ac90e04cc83f26e13 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ale=C5=A1=20K=C5=99enek?= Date: Tue, 28 Nov 2006 20:24:01 +0000 Subject: [PATCH] PREFIX is set to stage by default - fix build in the old glite fashion - should not break build in etics --- org.glite.lb.client/Makefile | 4 +++- org.glite.lb.client/project/configure.properties.xml | 5 ++++- org.glite.lb.client/project/version.properties | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/org.glite.lb.client/Makefile b/org.glite.lb.client/Makefile index 2bbb6e3..ac82274 100644 --- a/org.glite.lb.client/Makefile +++ b/org.glite.lb.client/Makefile @@ -8,19 +8,21 @@ globalprefix=glite lbprefix=lb package=glite-lb-client version=0.0.0 -PREFIX=/opt/glite glite_location=/opt/glite globus_prefix=/opt/globus nothrflavour=gcc32 thrflavour=gcc32pthr + CC:=gcc CXX:=g++ -include Makefile.inc -include ../project/version.properties +PREFIX?=${glite_location} + version=${module.version} VPATH=${top_srcdir}/src:${top_srcdir}/test:${top_srcdir}/examples:${top_srcdir}/doc diff --git a/org.glite.lb.client/project/configure.properties.xml b/org.glite.lb.client/project/configure.properties.xml index 4ca504f..fc29565 100644 --- a/org.glite.lb.client/project/configure.properties.xml +++ b/org.glite.lb.client/project/configure.properties.xml @@ -20,6 +20,9 @@ Revision history: $Log$ + Revision 1.8 2006/09/20 10:50:08 zsalvet + Remove CVS conflict section. + Revision 1.7 2006/09/19 20:27:40 akrenek Builds after merge _RC31 @@ -61,7 +64,7 @@ distdir=${dist.dir} globalprefix=${global.prefix} lbprefix=${subsystem.prefix} package=${module.package.name} -PREFIX=${install.dir} +# PREFIX=${install.dir} version=${module.version} glite_location=${with.glite.location} globus_prefix=${with.globus.prefix} diff --git a/org.glite.lb.client/project/version.properties b/org.glite.lb.client/project/version.properties index 1d12476..14f6287 100644 --- a/org.glite.lb.client/project/version.properties +++ b/org.glite.lb.client/project/version.properties @@ -1,4 +1,4 @@ #Fri Sep 02 14:17:41 CEST 2005 # glite-lb-client_branch_3_0_0_RC15 tag is taken! -module.version=2.2.4 +module.version=2.2.5 module.age=0 -- 1.8.2.3