From: Aleš Křenek <ljocha@ics.muni.cz>
Date: Fri, 23 Mar 2007 13:01:18 +0000 (+0000)
Subject: conflict after merge
X-Git-Tag: merge_31_head_after~6
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=09d57a8fde316b5b868e42f3e5e4f40f6df57293;p=jra1mw.git

conflict after merge
---

diff --git a/org.glite.lb.client-interface/Makefile b/org.glite.lb.client-interface/Makefile
index 98b167c..8cfb1d9 100644
--- a/org.glite.lb.client-interface/Makefile
+++ b/org.glite.lb.client-interface/Makefile
@@ -65,6 +65,9 @@ distbin:
 	rm -rf ${top_srcdir}/tmpbuilddir
 	
 doc: generate 
+	cp ${top_srcdir}/doc/*.dox .
+	echo "PROJECT_NUMBER = ${version}" >> C.dox
+	echo "PROJECT_NUMBER = ${version}" >> CPP.dox
 	doxygen C.dox
 	doxygen CPP.dox
 
@@ -83,5 +86,5 @@ endif
 	fi
 
 clean:
-	rm -f *.h
+	rm -f *.h *.dox