conflict after merge

diff --git a/org.glite.lb.client-interface/Makefile b/org.glite.lb.client-interface/Makefile
index 98b167c..8cfb1d9 100644 (file)
--- 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