From 84af2da27534f5690b6e79f70903b2ed1ea61190 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <valtri@civ.zcu.cz>
Date: Thu, 3 Mar 2011 19:41:54 +0000
Subject: [PATCH] Deployment fixes after preliminary certification checks: -
 update location in examples - enable metapackage files for EMI too,   install
 them in LB/PX yaim modules

---
 org.glite.lb.client/examples/gen_begin | 12 +++++++-----
 org.glite.lb.glite-LB/Makefile         |  8 --------
 org.glite.lb.yaim/Makefile             | 10 ++++++++++
 org.glite.px.glite-PX/Makefile         |  8 --------
 org.glite.px.myproxy-yaim/Makefile     | 10 ++++++++++
 5 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/org.glite.lb.client/examples/gen_begin b/org.glite.lb.client/examples/gen_begin
index feb13c2..e736ffb 100755
--- a/org.glite.lb.client/examples/gen_begin
+++ b/org.glite.lb.client/examples/gen_begin
@@ -24,11 +24,13 @@ if [ `echo $(basename $0) | grep 'glite-lb-' | wc -l` = "1" ]; then
 	PREFIX=glite-lb-
 fi
 LOGFD=${LOGFD:-2}
-if [ -d `dirname $0`/../bin ]; then
-	BINDIR=`dirname $0`/../bin
-else
-	BINDIR=`dirname $0`
-fi
+BINDIR="`dirname $0`"
+for dir in "`dirname $0`/../bin" "`dirname $0`/../../../bin"; do
+	if [ -d "$dir" ]; then
+		BINDIR="$dir"
+		break;
+	fi
+done
 LOGEV=${LOGEV:-${BINDIR}/${PREFIX}logevent}${SUFFIX}
 JOB_REG=${JOB_REG:-`dirname $0`/${PREFIX}job_reg}${SUFFIX}
 EDG_JOBID=
diff --git a/org.glite.lb.glite-LB/Makefile b/org.glite.lb.glite-LB/Makefile
index bf7ef00..8b553a1 100644
--- a/org.glite.lb.glite-LB/Makefile
+++ b/org.glite.lb.glite-LB/Makefile
@@ -9,16 +9,8 @@ prefix=
 -include ../project/version.properties
 
 default all:
-	echo -e "${gLiteCopyrightText}\n\n${gLiteLicenseText}" > LICENSE
-	cp LICENSE COPYRIGHT
-	echo ${module.version}-${module.age} > node-version
-	echo ${platformArch} > arch
-	echo "NA" > service
-	echo "NA" > update
 
 install:
-	mkdir -p ${DESTDIR}${PREFIX}${prefix}/release/glite-LB
-	cp -fp LICENSE COPYRIGHT node-version arch service update ${DESTDIR}${PREFIX}${prefix}/release/glite-LB/
 
 stage:
 	$(MAKE) install PREFIX=${stagedir}
diff --git a/org.glite.lb.yaim/Makefile b/org.glite.lb.yaim/Makefile
index 4d82346..1d19dbe 100644
--- a/org.glite.lb.yaim/Makefile
+++ b/org.glite.lb.yaim/Makefile
@@ -26,6 +26,14 @@ all ${FILES}:
 	fi; \
 	sed -e 's:@glite_prefix@:${sysroot}${prefix}:' -e 's:@glite_etc@:${sysconfdir}:' -e "s:@glite_var@:$$glite_var:" $(top_srcdir)/config/defaults/glite-lb.pre > glite-lb.pre
 
+	# metapackage info
+	echo -e "${gLiteCopyrightText}\n\n${gLiteLicenseText}" > LICENSE
+	cp LICENSE COPYRIGHT
+	echo ${module.version}-${module.age} > node-version
+	echo ${platformArch} > arch
+	echo "NA" > service
+	echo "NA" > update
+
 install: ${FILES}
 	mkdir -p ${DESTDIR}${PREFIX}${yaim_prefix}/yaim/functions/
 	mkdir -p ${DESTDIR}${PREFIX}${yaim_prefix}/yaim/node-info.d
@@ -37,6 +45,8 @@ install: ${FILES}
 	install -m 0644 glite-lb ${DESTDIR}${PREFIX}${yaim_prefix}/yaim/node-info.d
 	install -m 0644 glite-lb.pre ${DESTDIR}${PREFIX}${yaim_prefix}/yaim/defaults
 	echo "$(package) $(module.version)-$(module.age)" > ${DESTDIR}${PREFIX}${yaim_prefix}/yaim/etc/versions/$(package)
+	mkdir -p ${DESTDIR}${PREFIX}${yaim_prefix}/release/glite-LB
+	cp -fp LICENSE COPYRIGHT node-version arch service update ${DESTDIR}${PREFIX}${yaim_prefix}/release/glite-LB/
 
 stage:
 	$(MAKE) install PREFIX=${stagedir}
diff --git a/org.glite.px.glite-PX/Makefile b/org.glite.px.glite-PX/Makefile
index 701c01e..55624f6 100644
--- a/org.glite.px.glite-PX/Makefile
+++ b/org.glite.px.glite-PX/Makefile
@@ -9,16 +9,8 @@ prefix=
 -include ../project/version.properties
 
 default all:
-	echo -e "${gLiteCopyrightText}\n\n${gLiteLicenseText}" > LICENSE
-	cp LICENSE COPYRIGHT
-	echo ${module.version}-${module.age} > node-version
-	echo ${platformArch} > arch
-	echo "NA" > service
-	echo "NA" > update
 
 install:
-	mkdir -p ${DESTDIR}${PREFIX}${prefix}/release/glite-PX
-	cp -fp LICENSE COPYRIGHT node-version arch service update ${DESTDIR}${PREFIX}${prefix}/release/glite-PX/
 
 stage:
 	$(MAKE) install PREFIX=${stagedir}
diff --git a/org.glite.px.myproxy-yaim/Makefile b/org.glite.px.myproxy-yaim/Makefile
index 0ad8e8d..78599ae 100644
--- a/org.glite.px.myproxy-yaim/Makefile
+++ b/org.glite.px.myproxy-yaim/Makefile
@@ -27,6 +27,14 @@ all ${FILES}:
 	fi; \
 	sed -e 's:@glite_prefix@:${sysroot}${prefix}:' -e 's:@glite_etc@:${sysconfdir}:' -e "s:@glite_var@:$$glite_var:" $(top_srcdir)/config/defaults/glite-px.pre > glite-px.pre
 
+	# metapackage files
+	echo -e "${gLiteCopyrightText}\n\n${gLiteLicenseText}" > LICENSE
+	cp LICENSE COPYRIGHT
+	echo ${module.version}-${module.age} > node-version
+	echo ${platformArch} > arch
+	echo "NA" > service
+	echo "NA" > update
+
 install: ${FILES}
 	mkdir -p ${DESTDIR}${PREFIX}${yaim_prefix}/yaim/functions/
 	mkdir -p ${DESTDIR}${PREFIX}${yaim_prefix}/yaim/node-info.d
@@ -40,6 +48,8 @@ install: ${FILES}
 	install -m 0644 glite-px ${DESTDIR}${PREFIX}${yaim_prefix}/yaim/node-info.d; \
 	install -m 0644 glite-px.pre ${DESTDIR}${PREFIX}${yaim_prefix}/yaim/defaults
 	echo "$(package) $(module.version)-$(module.age)" > ${DESTDIR}${PREFIX}${yaim_prefix}/yaim/etc/versions/$(package)
+	mkdir -p ${DESTDIR}${PREFIX}${yaim_prefix}/release/glite-PX
+	cp -fp LICENSE COPYRIGHT node-version arch service update ${DESTDIR}${PREFIX}${yaim_prefix}/release/glite-PX/
 
 stage:
 	$(MAKE) install PREFIX=${stagedir}
-- 
1.8.2.3