From: Jan Pospíšil <honik@ntc.zcu.cz>
Date: Thu, 20 Apr 2006 08:28:50 +0000 (+0000)
Subject: stage conflict
X-Git-Tag: gridsite-core_R_1_1_19~67
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=630248fb87ac829cc0c82737fe19a281a22bc50e;p=jra1mw.git

stage conflict
---

diff --git a/org.glite.lb.client-interface/Makefile b/org.glite.lb.client-interface/Makefile
index 506e31f..d48cea5 100644
--- a/org.glite.lb.client-interface/Makefile
+++ b/org.glite.lb.client-interface/Makefile
@@ -42,9 +42,12 @@ check:
 
 interface_version.h: ${top_srcdir}/project/version.properties
 	echo "#define GLITE_LB_CLIENT_INTERFACE \"${version}\"" >$@ 
-
 stage: generate
+ifdef LB_STANDALONE
 	$(MAKE) install PREFIX=${stagedir} DOSTAGE=yes
+else
+	$(MAKE) install PREFIX=${top_srcdir}/${stagedir} DOSTAGE=yes
+endif
 
 dist: distsrc distbin
 
@@ -59,11 +62,11 @@ distbin:
 	cd ${top_srcdir}/tmpbuilddir && tar -czf ${top_srcdir}/${distdir}/${package}-${version}_bin.tar.gz *
 	rm -rf ${top_srcdir}/tmpbuilddir
 	
-doc: generate
+doc: generate doc
 	doxygen C.dox
 	doxygen CPP.dox
 
-install: generate doc
+install: generate 
 	-mkdir -p ${PREFIX}/${STAGETO}
 	-mkdir -p ${PREFIX}/share/doc/${package}-${version}
 	install -m 644 ${GEN_H} ${PREFIX}/${STAGETO}