From 09d57a8fde316b5b868e42f3e5e4f40f6df57293 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ale=C5=A1=20K=C5=99enek?= Date: Fri, 23 Mar 2007 13:01:18 +0000 Subject: [PATCH] conflict after merge --- org.glite.lb.client-interface/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 -- 1.8.2.3