From: František Dvořák <valtri@civ.zcu.cz>
Date: Sun, 11 Dec 2011 22:54:56 +0000 (+0000)
Subject: Don't delete debian/ directory from 'clean' target, update package names (preparation... 
X-Git-Tag: merge_30_head_take2_after~14
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=f2b0add592df69a1c83ff60e6eddd5b7c574caa4;p=jra1mw.git

Don't delete debian/ directory from 'clean' target, update package names (preparation for new packaging).
---

diff --git a/org.glite.px.emi-px/Makefile b/org.glite.px.emi-px/Makefile
index ce91d5f..c3f4183 100644
--- a/org.glite.px.emi-px/Makefile
+++ b/org.glite.px.emi-px/Makefile
@@ -1,6 +1,6 @@
 top_srcdir=..
 stagedir=.
-package=glite-PX
+package=emi-px
 version=0.0.0
 PREFIX=/opt/glite
 prefix=
@@ -18,6 +18,8 @@ stage:
 check:
 
 clean:
-	rm -rvf log.xml rpmbuild/ RPMS/ tgz/ debian/
 
-.PHONY: default all check install stage clean
+distclean:
+	rm -rvf Makefile.inc *.spec debian/
+
+.PHONY: default all check install stage clean distclean
diff --git a/org.glite.px.glite-PX/Makefile b/org.glite.px.glite-PX/Makefile
index ce91d5f..fad7803 100644
--- a/org.glite.px.glite-PX/Makefile
+++ b/org.glite.px.glite-PX/Makefile
@@ -18,6 +18,8 @@ stage:
 check:
 
 clean:
-	rm -rvf log.xml rpmbuild/ RPMS/ tgz/ debian/
 
-.PHONY: default all check install stage clean
+distclean:
+	rm -rvf Makefile.inc *.spec debian/
+
+.PHONY: default all check install stage clean distclean
diff --git a/org.glite.px.myproxy-yaim/Makefile b/org.glite.px.myproxy-yaim/Makefile
index d8bda34..ad86914 100644
--- a/org.glite.px.myproxy-yaim/Makefile
+++ b/org.glite.px.myproxy-yaim/Makefile
@@ -54,6 +54,9 @@ stage:
 check:
 
 clean:
-	rm -rvf log.xml rpmbuild/ RPMS/ tgz/ debian/ ${FILES}
+	rm -rvf ${FILES}
+
+distclean:
+	rm -rvf Makefile.inc *.spec debian/
 
 .PHONY: default all check install stage clean
diff --git a/org.glite.px.proxyrenewal/Makefile b/org.glite.px.proxyrenewal/Makefile
index c0726a9..c5846f2 100644
--- a/org.glite.px.proxyrenewal/Makefile
+++ b/org.glite.px.proxyrenewal/Makefile
@@ -22,7 +22,7 @@ stagedir=.
 distdir=.
 globalprefix=glite
 lbprefix=lb
-package=glite-security-proxyrenewal
+package=glite-px-proxyrenewal
 version=0.0.0
 PREFIX=/opt/glite
 libdir=lib
@@ -204,4 +204,7 @@ clean:
 	$(RM) ${MAN1_GZ} ${MAN8_GZ}
 	$(RM) -rf .libs
 
-.PHONY: default all compile examples check stage dist distsrc distbin install clean
+distclean:
+	rm -rvf Makefile.inc *.spec debian/
+
+.PHONY: default all compile examples check stage dist distsrc distbin install clean distclean