Fixed package path removal in distsrc target

diff --git a/org.glite.lb.client-interface/Makefile b/org.glite.lb.client-interface/Makefile
index 6aa3be0..f01f8c5 100644 (file)
--- a/org.glite.lb.client-interface/Makefile
+++ b/org.glite.lb.client-interface/Makefile
@@ -4,6 +4,8 @@ builddir=build
 top_builddir=${top_srcdir}/${builddir}
 stagedir=.
 distdir=.
+globalprefix=glite
+lbprefix=lb
 package=glite-lb-client-interface
 version=0.0.0
 PREFIX=/opt/glite
@@ -19,19 +21,10 @@ STAGETO=include/${globalprefix}/${lbprefix}
 STATIC_H=consumer.h context.h dump.h load.h notification.h notifid.h purge.h
 GEN_H=events.h jobstat.h producer.h
 
-stage: stage-gen stage-static
-all compile: generate
-
-stage-static:
-       -mkdir -p ${top_srcdir}/${stagedir}/${STAGETO}
-       cd ${top_srcdir}/interface && install -m 644 ${STATIC_H} ${top_srcdir}/${stagedir}/${STAGETO}
-
-stage-gen: generate
-       -mkdir -p ${top_srcdir}/${stagedir}/${STAGETO}
-       install -m 644 ${GEN_H} ${top_srcdir}/${stagedir}/${STAGETO}
-
 generate: ${GEN_H}
 
+all compile: generate
+
 check: 
        @echo No unit test required for interface-only module.
 
@@ -40,13 +33,16 @@ check:
        ${AT3} $< >$@ || rm -f $@
        chmod -w $@ >/dev/null
 
+stage:
+       $(MAKE) install PREFIX=${top_srcdir}/${stagedir}
+
 dist: distsrc distbin
 
 distsrc:
        mkdir -p ${top_srcdir}/${package}-${version}
        cd ${top_srcdir} && GLOBIGNORE="${package}-${version}" && cp -Rf * ${package}-${version}
        cd ${top_srcdir} && tar -czf ${distdir}/${package}-${version}_src.tar.gz --exclude-from=project/tar_exclude ${package}-${version}
-       rm -rf ${package}-${version}
+       rm -rf ${top_srcdir}/${package}-${version}
 
 distbin:
        $(MAKE) install PREFIX=${top_srcdir}/tmpbuilddir