From: Jan Pospíšil <honik@ntc.zcu.cz>
Date: Sun, 29 Apr 2007 15:54:38 +0000 (+0000)
Subject: cleanup: fix wrong staging, skip make doc in LB_STANDALONE
X-Git-Tag: glite-lb-common_R_5_0_2_1~4
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=6be3e633c72cd1f394d9e3c70cb4fdf9a6b6d2b8;p=jra1mw.git

cleanup: fix wrong staging, skip make doc in LB_STANDALONE
---

diff --git a/org.glite.lb.client-interface/Makefile b/org.glite.lb.client-interface/Makefile
index 892adf6..1328dbe 100644
--- a/org.glite.lb.client-interface/Makefile
+++ b/org.glite.lb.client-interface/Makefile
@@ -45,11 +45,10 @@ interface_version.h: ${top_srcdir}/project/version.properties
 
 ifdef LB_STANDALONE
 stage: generate
-	$(MAKE) install PREFIX=${stagedir} DOSTAGE=yes
 else
 stage: generate doc
-	$(MAKE) install PREFIX=${top_srcdir}/${stagedir} DOSTAGE=yes
 endif
+	$(MAKE) install PREFIX=${stagedir} DOSTAGE=yes
 
 dist: distsrc distbin
 
@@ -71,7 +70,11 @@ doc: generate
 	doxygen C.dox
 	doxygen CPP.dox
 
+ifdef LB_STANDALONE
+install: generate
+else
 install: generate doc
+endif
 	-mkdir -p ${PREFIX}/${STAGETO}
 	-mkdir -p ${PREFIX}/share/doc/${package}-${version}
 	install -m 644 ${GEN_H} ${PREFIX}/${STAGETO}
diff --git a/org.glite.lb.client-interface/project/configure.properties.xml b/org.glite.lb.client-interface/project/configure.properties.xml
index 3bfacd0..18b6bc8 100644
--- a/org.glite.lb.client-interface/project/configure.properties.xml
+++ b/org.glite.lb.client-interface/project/configure.properties.xml
@@ -20,6 +20,9 @@
 
 	Revision history:
 	$Log$
+	Revision 1.6  2007/02/03 19:27:15  jpospi
+	first step to remove the ant dependency
+
 	Revision 1.5  2005/08/03 09:30:10  akrenek
 	Merged the release 1.0 branch
 
@@ -78,7 +81,7 @@
 			<echo file="${module.build.dir}/Makefile.inc">
 top_srcdir=..
 builddir=build
-stagedir=${stage.dir}
+stagedir=${stage.abs.dir}
 distdir=${dist.dir}
 package=${module.package.name}
 globalprefix=${global.prefix}
@@ -86,19 +89,5 @@ lbprefix=${subsystem.prefix}
 PREFIX=${install.dir}
 version=${module.version}
 			</echo>
-			<copy file="${component.dir}/doc/C.dox" 
-				tofile="${module.build.dir}/C.dox" 
-				preservelastmodified="true"
-				overwrite="true" />
-			<copy file="${component.dir}/doc/CPP.dox" 
-				tofile="${module.build.dir}/CPP.dox" 
-				preservelastmodified="true"
-				overwrite="true" />
-			<echo file="${module.build.dir}/C.dox" append="true" >
-PROJECT_NUMBER        = ${module.version}
-			</echo>
-			<echo file="${module.build.dir}/CPP.dox" append="true" >
-PROJECT_NUMBER         = ${module.version}
-			</echo>
 	    </target>
 	</project>
diff --git a/org.glite.lb.client-interface/project/version.properties b/org.glite.lb.client-interface/project/version.properties
index 7fd033f..ad5ae2b 100644
--- a/org.glite.lb.client-interface/project/version.properties
+++ b/org.glite.lb.client-interface/project/version.properties
@@ -1,4 +1,4 @@
-#Fri Sep 02 14:16:31 CEST 2005
-# glite-lb-client-interface_branch_3_0_0_RC15 tag is taken!
+# $Id$
+# $Name$
 module.version=2.3.1
-module.age=1
+module.age=2