From: František Dvořák Date: Sun, 6 Mar 2011 11:15:39 +0000 (+0000) Subject: Proper default locations in startup scripts, generated during build X-Git-Tag: glite-lb-doc_R_1_2_2_1~4 X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=445a255ed27851bf770fcd5a575fbb6aaac9ccf7;p=jra1mw.git Proper default locations in startup scripts, generated during build --- diff --git a/org.glite.lb.harvester/Makefile b/org.glite.lb.harvester/Makefile index d0c2583..516e0ec 100644 --- a/org.glite.lb.harvester/Makefile +++ b/org.glite.lb.harvester/Makefile @@ -48,7 +48,15 @@ INSTALL:=libtool --mode=install install default: all -compile all: harvester doc debug +compile all: startup harvester doc debug + +startup: ${top_srcdir}/config/startup + glite_var="${localstatedir}/glite"; \ + if echo "${localstatedir}" | grep 'glite'>/dev/null; then \ + glite_var="${localstatedir}"; \ + fi; \ + sed -e 's:@glite_prefix@:${sysroot}${prefix}:' -e 's:@glite_etc@:${sysconfdir}:' -e "s:@glite_var@:$$glite_var:" $< > $@ + chmod +x $@ check: @@ -75,7 +83,7 @@ install: compile clean: rm -rfv *.o *.lo *.loT .libs/ manpage.links manpage.refs - rm -rvf harvester harvester-dbg glite-lb-harvester.* + rm -rvf harvester harvester-dbg glite-lb-harvester.* startup rm -rvf log.xml project/ rpmbuild/ RPMS/ tgz/ debian/ harvester: harvester.o diff --git a/org.glite.lb.harvester/config/startup b/org.glite.lb.harvester/config/startup index 6a125fe..2768571 100755 --- a/org.glite.lb.harvester/config/startup +++ b/org.glite.lb.harvester/config/startup @@ -17,9 +17,9 @@ # limitations under the License. # -GLITE_LB_LOCATION=${GLITE_LB_LOCATION:-/opt/glite} -GLITE_LB_LOCATION_ETC=${GLITE_LB_LOCATION_ETC:-/opt/glite/etc} -GLITE_LB_LOCATION_VAR=${GLITE_LB_LOCATION_VAR:-/var/glite} +GLITE_LB_LOCATION=${GLITE_LB_LOCATION:-'@glite_prefix@'} +GLITE_LB_LOCATION_ETC=${GLITE_LB_LOCATION_ETC:-'@glite_etc@'} +GLITE_LB_LOCATION_VAR=${GLITE_LB_LOCATION_VAR:-'@glite_var@'} [ -f /etc/glite.conf ] && . /etc/glite.conf [ -f $GLITE_LB_LOCATION_ETC/glite-wms.conf ] && . $GLITE_LB_LOCATION_ETC/glite-wms.conf diff --git a/org.glite.lb.logger/Makefile b/org.glite.lb.logger/Makefile index c245a78..64d0b1e 100644 --- a/org.glite.lb.logger/Makefile +++ b/org.glite.lb.logger/Makefile @@ -124,7 +124,15 @@ MAN = $(MAN_GZ:.gz=) default: all -all compile: $(LOGD) $(INTERLOGD) $(NOTIF_INTERLOGD) ${MAN_GZ} +all compile: startup $(LOGD) $(INTERLOGD) $(NOTIF_INTERLOGD) ${MAN_GZ} + +startup: ${top_srcdir}/config/startup + glite_var="${localstatedir}/glite"; \ + if echo "${localstatedir}" | grep 'glite'>/dev/null; then \ + glite_var="${localstatedir}"; \ + fi; \ + sed -e 's:@glite_prefix@:${sysroot}${prefix}:' -e 's:@glite_etc@:${sysconfdir}:' -e "s:@glite_var@:$$glite_var:" $< > $@ + chmod +x $@ glite-lb-logd: ${LOGD_OBJS} ${LINK} -o $@ ${LOGD_OBJS} ${COMMON_LIB}${default_nothrflavour} ${EXT_LIB} @@ -195,7 +203,7 @@ ifdef LB_PERF ${INSTALL} -m 755 ${top_srcdir}/src/perftest_ll.sh ${DESTDIR}${PREFIX}${prefix}/sbin ${INSTALL} -m 755 ${top_srcdir}/src/perftest_il.sh ${DESTDIR}${PREFIX}${prefix}/sbin endif - ${INSTALL} -m 755 ${top_srcdir}/config/startup ${DESTDIR}${PREFIX}${sysconfdir}/init.d/glite-lb-locallogger + ${INSTALL} -m 755 startup ${DESTDIR}${PREFIX}${sysconfdir}/init.d/glite-lb-locallogger ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} ( cd ${top_srcdir}/interface && ${INSTALL} -m 644 ${HDRS} ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbprefix} ) ( cd ${top_srcdir}/project && ${INSTALL} -m 644 ChangeLog package.description package.summary ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} ) @@ -235,5 +243,5 @@ il_test.o IlTestBase.o server_msgTest.o event_queueTest.o input_queue_socketTest ${CXX} ${CFLAGS} ${CPPUNIT_CFLAGS} -c $< -o $@ clean: - rm -rvf .libs/ *.o *.lo *.no ${LOGD} ${INTERLOGD} ${NOTIF_INTERLOGD} ${MAN_GZ} + rm -rvf .libs/ *.o *.lo *.no ${LOGD} ${INTERLOGD} ${NOTIF_INTERLOGD} ${MAN_GZ} startup rm -rvf log.xml project/ rpmbuild/ RPMS/ tgz/ debian/ diff --git a/org.glite.lb.logger/config/startup b/org.glite.lb.logger/config/startup index 7a80c96..9d7285f 100755 --- a/org.glite.lb.logger/config/startup +++ b/org.glite.lb.logger/config/startup @@ -17,8 +17,9 @@ # limitations under the License. # -GLITE_LB_LOCATION=${GLITE_LB_LOCATION:-/opt/glite} -GLITE_LB_LOCATION_VAR=${GLITE_LB_LOCATION_VAR:-$GLITE_LB_LOCATION/var} +GLITE_LB_LOCATION=${GLITE_LB_LOCATION:-'@glite_prefix@'} +GLITE_LB_LOCATION_ETC=${GLITE_LB_LOCATION_ETC:-'@glite_etc@'} +GLITE_LB_LOCATION_VAR=${GLITE_LB_LOCATION_VAR:-'@glite_var@'} [ -f /etc/glite.conf ] && . /etc/glite.conf [ -f $GLITE_LB_LOCATION_ETC/glite-wms.conf ] && . $GLITE_LB_LOCATION_ETC/glite-wms.conf diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile index 4be58d1..74d13e5 100644 --- a/org.glite.lb.server/Makefile +++ b/org.glite.lb.server/Makefile @@ -254,10 +254,18 @@ glite-lb-bkindex: ${INDEX_OBJS} glite-lb-mon-db: ${MONDB_OBJS} ${LINKXX} -o $@ ${MONDB_OBJS} ${MONDB_LIBS} -compile: generate glite-lb-bkserverd glite-lb-bkindex glite-lb-mon-db ${STATIC_LIB_BK} ${LCAS_PLUGIN_LIB} ${MAN_GZ} +compile: generate startup glite-lb-bkserverd glite-lb-bkindex glite-lb-mon-db ${STATIC_LIB_BK} ${LCAS_PLUGIN_LIB} ${MAN_GZ} generate: store.c index.c +startup: ${top_srcdir}/config/startup + glite_var="${localstatedir}/glite"; \ + if echo "${localstatedir}" | grep 'glite'>/dev/null; then \ + glite_var="${localstatedir}"; \ + fi; \ + sed -e 's:@glite_prefix@:${sysroot}${prefix}:' -e 's:@glite_etc@:${sysconfdir}:' -e "s:@glite_var@:$$glite_var:" $< > $@ + chmod +x $@ + check: compile test.xml test.query -echo check.query not complete yet @@ -353,7 +361,7 @@ install: done ${INSTALL} -m 755 ${top_srcdir}/config/glite-lb-migrate_db2version20 ${DESTDIR}${PREFIX}${sysconfdir}/glite-lb - ${INSTALL} -m 755 ${top_srcdir}/config/startup ${DESTDIR}${PREFIX}${sysconfdir}/init.d/glite-lb-bkserverd + ${INSTALL} -m 755 startup ${DESTDIR}${PREFIX}${sysconfdir}/init.d/glite-lb-bkserverd mkdir -p ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbprefix} (cd ${top_srcdir}/interface && install -m 644 ${HDRS} ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbprefix}) @@ -366,7 +374,7 @@ ifdef LB_PERF endif clean: - rm -rvf *.c *.h *.ch *.xh *.xml *.nsmap *.o *.lo .libs glite-lb-* ${STATIC_LIB_BK} ${LCAS_PLUGIN_LIB} test* ${MAN_GZ} ${EXAMPLES} + rm -rvf *.c *.h *.ch *.xh *.xml *.nsmap *.o *.lo .libs glite-lb-* ${STATIC_LIB_BK} ${LCAS_PLUGIN_LIB} test* ${MAN_GZ} ${EXAMPLES} startup rm -rvf log.xml project/ rpmbuild/ RPMS/ tgz/ debian/ %.c: %.c.T diff --git a/org.glite.lb.server/config/startup b/org.glite.lb.server/config/startup index d00e1b8..9c192e3 100755 --- a/org.glite.lb.server/config/startup +++ b/org.glite.lb.server/config/startup @@ -17,8 +17,9 @@ # limitations under the License. # -GLITE_LB_LOCATION=${GLITE_LB_LOCATION:-/opt/glite} -GLITE_LB_LOCATION_VAR=${GLITE_LB_LOCATION_VAR:-/var/glite} +GLITE_LB_LOCATION=${GLITE_LB_LOCATION:-'@glite_prefix@'} +GLITE_LB_LOCATION_VAR=${GLITE_LB_LOCATION_VAR:-'@glite_var@'} +GLITE_LB_LOCATION_ETC=${GLITE_LB_LOCATION_ETC:-'@glite_etc@'} GLITE_JP_LOCATION=${GLITE_JP_LOCATION:-$GLITE_LB_LOCATION} [ -f /etc/glite.conf ] && . /etc/glite.conf diff --git a/org.glite.px.proxyrenewal/Makefile b/org.glite.px.proxyrenewal/Makefile index 62902f6..76e3ffd 100644 --- a/org.glite.px.proxyrenewal/Makefile +++ b/org.glite.px.proxyrenewal/Makefile @@ -113,7 +113,15 @@ CLIENT:=glite-proxy-renew EXAMPLES := renew_core default: all -compile all: ${lib_LTLIBRARIES} ${DAEMON} ${CLIENT} +compile all: startup ${lib_LTLIBRARIES} ${DAEMON} ${CLIENT} + +startup: ${top_srcdir}/config/startup + glite_var="${localstatedir}/glite"; \ + if echo "${localstatedir}" | grep 'glite'>/dev/null; then \ + glite_var="${localstatedir}"; \ + fi; \ + sed -e 's:@glite_prefix@:${sysroot}${prefix}:' -e 's:@glite_etc@:${sysconfdir}:' -e "s:@glite_var@:$$glite_var:" $< > $@ + chmod +x $@ ifeq (${thrflavour},) ${LIB}: ${LIBOBJ} @@ -177,10 +185,10 @@ install: ${INSTALL} -m 755 ${DAEMON} ${CLIENT} ${DESTDIR}${PREFIX}${prefix}/bin ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} cd ${top_srcdir}/interface && ${INSTALL} -m 644 renewal.h renewal_core.h ${DESTDIR}${PREFIX}${prefix}/include/glite/security/proxyrenewal - ${INSTALL} -m 755 ${top_srcdir}/config/startup ${DESTDIR}${PREFIX}${sysconfdir}/init.d/glite-proxy-renewald + ${INSTALL} -m 755 startup ${DESTDIR}${PREFIX}${sysconfdir}/init.d/glite-proxy-renewald clean: - $(RM) ${lib_LTLIBRARIES} $(DAEMON) $(CLIENT) $(EXAMPLES) *.o *.lo core + $(RM) ${lib_LTLIBRARIES} $(DAEMON) $(CLIENT) $(EXAMPLES) *.o *.lo core startup .PHONY: default all compile examples check stage dist distsrc distbin install clean diff --git a/org.glite.px.proxyrenewal/config/startup b/org.glite.px.proxyrenewal/config/startup index f141908..98f9047 100755 --- a/org.glite.px.proxyrenewal/config/startup +++ b/org.glite.px.proxyrenewal/config/startup @@ -16,8 +16,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -GLITE_PX_LOCATION=${GLITE_PX_LOCATION:-/opt/glite} -GLITE_PX_LOCATION_VAR=${GLITE_PX_LOCATION_VAR:-/opt/glite/var} +GLITE_PX_LOCATION=${GLITE_PX_LOCATION:-'@glite_prefix@'} +GLITE_PX_LOCATION_ETC=${GLITE_PX_LOCATION_ETC:-'@glite_etc@'} +GLITE_PX_LOCATION_VAR=${GLITE_PX_LOCATION_VAR:-'@glite_var@'} [ -f /etc/glite.conf ] && . /etc/glite.conf [ -f $GLITE_PX_LOCATION_ETC/glite-wms.conf ] && . $GLITE_PX_LOCATION_ETC/glite-wms.conf