From: František Dvořák Date: Fri, 25 Feb 2011 19:08:45 +0000 (+0000) Subject: Basic support of FHS standard (using ETICS and ETICS-less builds): X-Git-Tag: glite-lb-client-java_R_1_1_1_1~24 X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=844cd280e053ea5f8f5f04a86e4d3d7e0a894948;p=jra1mw.git Basic support of FHS standard (using ETICS and ETICS-less builds): - root directory option (ETICS performs own files relocation) - prefix option as prefix inside stage - sysconfdir option (for /etc vs /usr) - DESTDIR in makefiles --- diff --git a/org.glite.jobid.api-c/Makefile b/org.glite.jobid.api-c/Makefile index faaa4a3..b73e4e9 100644 --- a/org.glite.jobid.api-c/Makefile +++ b/org.glite.jobid.api-c/Makefile @@ -57,7 +57,7 @@ version_info:=-version-info ${shell \ perl -e '$$,=":"; @F=split /\./,"${version}"; print $$F[0]+$$F[1]+${offset},$$F[2],$$F[1]' } ${LIB}: ${LIBOBJS} - ${LINK} ${version_info} -o $@ ${LIBLOBJS} -rpath ${PREFIX}/${libdir} + ${LINK} ${version_info} -o $@ ${LIBLOBJS} -rpath ${PREFIX}${prefix}/${libdir} check: compile base64_test ./base64_test base64_test.xml @@ -72,10 +72,10 @@ clean: rm -rvf log.xml project/ rpmbuild/ RPMS/ tgz/ debian/ install: ${LIB} - mkdir -p ${PREFIX}/${libdir} - mkdir -p ${PREFIX}/include/${globalprefix}/${jobidprefix} - ${INSTALL} -m 644 ${LIB} ${PREFIX}/${libdir} - (cd ${top_srcdir}/interface; ${INSTALL} -m 644 ${HDRS} ${PREFIX}/include/${globalprefix}/${jobidprefix}) + mkdir -p ${DESTDIR}${PREFIX}${prefix}/${libdir} + mkdir -p ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${jobidprefix} + ${INSTALL} -m 644 ${LIB} ${DESTDIR}${PREFIX}${prefix}/${libdir} + (cd ${top_srcdir}/interface; ${INSTALL} -m 644 ${HDRS} ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${jobidprefix}) %.o: %.c diff --git a/org.glite.jobid.api-cpp/Makefile b/org.glite.jobid.api-cpp/Makefile index 9f25c7c..3792efa 100644 --- a/org.glite.jobid.api-cpp/Makefile +++ b/org.glite.jobid.api-cpp/Makefile @@ -46,8 +46,8 @@ clean: rm -rvf log.xml project/ rpmbuild/ RPMS/ tgz/ debian/ install: - mkdir -p ${PREFIX}/include/${globalprefix}/${jobidprefix} - (cd ${top_srcdir}/interface; ${INSTALL} -m 644 ${HDRS} ${PREFIX}/include/${globalprefix}/${jobidprefix}) + mkdir -p ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${jobidprefix} + (cd ${top_srcdir}/interface; ${INSTALL} -m 644 ${HDRS} ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${jobidprefix}) %.o: %.c diff --git a/org.glite.jobid.api-java/Makefile b/org.glite.jobid.api-java/Makefile index b920e6c..bb989a7 100644 --- a/org.glite.jobid.api-java/Makefile +++ b/org.glite.jobid.api-java/Makefile @@ -4,8 +4,8 @@ all compile: ${ant_prefix}/bin/ant -Dfile.reference.commons-codec.jar=${jakarta-commons-codec_jar} install: - mkdir -p ${PREFIX}/share/java - cp dist/jobid-api-java.jar ${PREFIX}/share/java + mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/java + cp dist/jobid-api-java.jar ${DESTDIR}${PREFIX}${prefix}/share/java check: diff --git a/org.glite.lb.client-java/Makefile b/org.glite.lb.client-java/Makefile index 966d379..cb92f44 100644 --- a/org.glite.lb.client-java/Makefile +++ b/org.glite.lb.client-java/Makefile @@ -13,8 +13,8 @@ JAVAC:=${jdk_prefix}/bin/javac JAVAH:=${jdk_prefix}/bin/javah JAVA:=${jdk_prefix}/bin/java -GEN:=${stagedir}/sbin/glite-lb-at3 project/genEventTypes.pl -AT3DIR:=${stagedir}/share/lb/at3 +GEN:=${stagedir}${prefix}/sbin/glite-lb-at3 project/genEventTypes.pl +AT3DIR:=${stagedir}${prefix}/share/glite-lb/at3 axis_classpath:=$(shell ls ${axis_prefix}/lib/*.jar | tr '\012' :) trustmanager_classpath:=${trustmanager_prefix}/share/java/glite-security-trustmanager.jar:${trustmanager_prefix}/share/java/trustmanager.jar:${trustmanager_prefix}/share/java/trustmanager-axis.jar @@ -22,7 +22,7 @@ all compile: genevents genws compile-java build-jar examples build-c compile-java: ${JAVAC} \ - -classpath ${jakarta-commons-lang_jar}:${stagedir}/share/java/jobid-api-java.jar:${trustmanager_classpath}:${utiljava_prefix}/share/java/glite-security-util-java.jar:${axis_classpath} \ + -classpath ${jakarta-commons-lang_jar}:${stagedir}${prefix}/share/java/jobid-api-java.jar:${trustmanager_classpath}:${utiljava_prefix}/share/java/glite-security-util-java.jar:${axis_classpath} \ -d build \ src/org/glite/lb/*.java \ build/gen/*.java \ @@ -49,7 +49,7 @@ examples: build/examples build/examples: ${FULL_EXAMPLES} ${SSL_EXAMPLES} ${TM_EXAMPLES} -mkdir -p build/examples/src/simple-ssl build/examples/src/simple-trustmanager - ${jdk_prefix}/bin/javac -d build/examples -cp build:build/examples:${stagedir}/share/java/jobid-api-java.jar:${axis_classpath} ${FULL_EXAMPLES} + ${jdk_prefix}/bin/javac -d build/examples -cp build:build/examples:${stagedir}${prefix}/share/java/jobid-api-java.jar:${axis_classpath} ${FULL_EXAMPLES} ${jdk_prefix}/bin/javac -d build/examples -cp build:build/examples:${axis_classpath} ${SSL_EXAMPLES} ${jdk_prefix}/bin/javac -d build/examples -cp build:${trustmanager_classpath}:${axis_classpath} ${TM_EXAMPLES} cp ${FULL_EXAMPLES} build/examples/src @@ -66,15 +66,15 @@ build/gen: genws: build/axis build/axis: - ${JAVA} -classpath ${axis_classpath} org.apache.axis.wsdl.WSDL2Java -o build/axis ${stagedir}/interface/LB.wsdl + ${JAVA} -classpath ${axis_classpath} org.apache.axis.wsdl.WSDL2Java -o build/axis ${stagedir}${prefix}/interface/LB.wsdl check: @echo "No check" install: - mkdir -p ${PREFIX}/share/java - cp build/lb-client-java.jar ${PREFIX}/share/java - cp build/examples/lb-client-java-examples.jar ${PREFIX}/share/java + mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/java + cp build/lb-client-java.jar ${DESTDIR}${PREFIX}${prefix}/share/java + cp build/examples/lb-client-java-examples.jar ${DESTDIR}${PREFIX}${prefix}/share/java cd build/c && $(MAKE) install PREFIX=${PREFIX} clean: diff --git a/org.glite.lb.client-java/src_c/Makefile b/org.glite.lb.client-java/src_c/Makefile index 2124d30..dbbcc94 100755 --- a/org.glite.lb.client-java/src_c/Makefile +++ b/org.glite.lb.client-java/src_c/Makefile @@ -14,14 +14,14 @@ VPATH=${topdir}/src_c compile: ${LIB} ${LIB}: ${OBJ} - libtool --mode=link ${CC} -rpath ${PREFIX}/${libdir} -o $@ ${OBJ} + libtool --mode=link ${CC} -rpath ${PREFIX}${prefix}/${libdir} -o $@ ${OBJ} %.lo: %.c libtool --mode=compile ${CC} -I.. -I${PATH_TO_JAVA}/include -I${PATH_TO_JAVA}/include/$(OS) -c $< install: compile - -mkdir -p ${PREFIX}/${libdir} - libtool --mode=install install -m 755 ${LIB} ${PREFIX}/${libdir} + -mkdir -p ${DESTDIR}${PREFIX}${prefix}/${libdir} + libtool --mode=install install -m 755 ${LIB} ${DESTDIR}${PREFIX}${prefix}/${libdir} clean: rm -rf ${OBJ} .libs ${LIB} diff --git a/org.glite.lb.client/Makefile b/org.glite.lb.client/Makefile index 02fc25c..3ebefaf 100644 --- a/org.glite.lb.client/Makefile +++ b/org.glite.lb.client/Makefile @@ -22,9 +22,9 @@ version=${module.version} VERSION_AHEAD=-3 VPATH=${top_srcdir}/src:${top_srcdir}/interface:${top_srcdir}/test:${top_srcdir}/examples:${top_srcdir}/doc -AT3=${stagedir}/sbin/glite-lb-at3 +AT3=${stagedir}${prefix}/sbin/glite-lb-at3 GENSAM=${top_srcdir}/examples/gen_sample_job -CHECK_VERSION:=VERSION=${version} VERSION_AHEAD=${VERSION_AHEAD} perl ${stagedir}/sbin/glite-lb-check_version.pl +CHECK_VERSION:=VERSION=${version} VERSION_AHEAD=${VERSION_AHEAD} perl ${stagedir}${prefix}/sbin/glite-lb-check_version.pl SUFFIXES = .T .l @@ -94,7 +94,7 @@ TRIO_LIB:=-lglite_lbu_trio CFLAGS:=${CFLAGS} ${DEBUG} \ -I. \ -I${top_srcdir}/src -I${top_srcdir}/interface \ - -I${stagedir}/include \ + -I${stagedir}${prefix}/include \ ${COVERAGE_FLAGS} \ -DBUILDING_LB_CLIENT \ -D_GNU_SOURCE ${LB_STANDALONE_FLAGS} ${LB_PERF_FLAGS} @@ -106,7 +106,7 @@ EXT_LIB:= CPPUNIT_LIBS?=-L${cppunit_prefix}/${libdir} -lcppunit CPPUNIT_CFLAGS?=-I${cppunit_prefix}/include -LDFLAGS:=${LDFLAGS} -L${stagedir}/${libdir} ${COVERAGE_FLAGS} +LDFLAGS:=${LDFLAGS} -L${stagedir}${prefix}/${libdir} ${COVERAGE_FLAGS} COMPILE:=libtool --mode=compile ${CC} ${CFLAGS} CXXCOMPILE:=libtool --mode=compile ${CXX} ${CXXFLAGS} @@ -199,28 +199,28 @@ default: all ifeq (${thrflavour},) ${LIB}: ${LIBOBJS} - ${LINK} ${version_info} -o $@ ${LIBLOBJS} -rpath ${PREFIX}/${libdir} \ + ${LINK} ${version_info} -o $@ ${LIBLOBJS} -rpath ${PREFIX}${prefix}/${libdir} \ ${COMMON_LIB} ${TRIO_LIB} \ -lglite_security_gss ${PLUSLIB}: ${PLUSOBJS} ${LIB} - ${LINKXX} ${version_info} -o $@ ${PLUSLOBJS} -rpath ${PREFIX}/${libdir} ${LIB} ${PLUS_EXTRA_LIB} + ${LINKXX} ${version_info} -o $@ ${PLUSLOBJS} -rpath ${PREFIX}${prefix}/${libdir} ${LIB} ${PLUS_EXTRA_LIB} else ${NOTHRLIB}: ${LIBOBJS} - ${LINK} ${version_info} -o $@ ${LIBLOBJS} -rpath ${PREFIX}/${libdir} \ + ${LINK} ${version_info} -o $@ ${LIBLOBJS} -rpath ${PREFIX}${prefix}/${libdir} \ ${COMMON_LIB_NOTHR} ${TRIO_LIB} \ -lglite_security_gss_${nothrflavour} ${THRLIB}: ${LIBTHROBJS} - ${LINK} ${version_info} -o $@ ${LIBTHRLOBJS} -rpath ${PREFIX}/${libdir} \ + ${LINK} ${version_info} -o $@ ${LIBTHRLOBJS} -rpath ${PREFIX}${prefix}/${libdir} \ ${COMMON_LIB_THR} ${TRIO_LIB} \ -lglite_security_gss_${thrflavour} ${NOTHRPLUSLIB}: ${PLUSOBJS} ${NOTHRLIB} - ${LINKXX} ${version_info} -o $@ ${PLUSLOBJS} -rpath ${PREFIX}/${libdir} ${NOTHRLIB} ${PLUS_EXTRA_LIB} + ${LINKXX} ${version_info} -o $@ ${PLUSLOBJS} -rpath ${PREFIX}${prefix}/${libdir} ${NOTHRLIB} ${PLUS_EXTRA_LIB} ${THRPLUSLIB}: ${PLUSTHROBJS} ${THRLIB} - ${LINKXX} ${version_info} -o $@ ${PLUSTHRLOBJS} -rpath ${PREFIX}/${libdir} ${THRLIB} ${PLUS_EXTRA_LIB} + ${LINKXX} ${version_info} -o $@ ${PLUSTHRLOBJS} -rpath ${PREFIX}${prefix}/${libdir} ${THRLIB} ${PLUS_EXTRA_LIB} endif logevent: logevent.o args.o @@ -325,55 +325,55 @@ JobStatus.h JobStatus.cpp: StatusAttrNames.pl #EventAttrNames.pl: # rm -f $@ -# ln -s ${stagedir}/share/perl/gLite/LB/$@ $@ +# ln -s ${stagedir}${prefix}/share/perl/gLite/LB/$@ $@ dist: distsrc distbin install: - mkdir -p ${PREFIX}/bin - mkdir -p ${PREFIX}/sbin - mkdir -p ${PREFIX}/include/${globalprefix}/${lbprefix} - mkdir -p ${PREFIX}/${libdir} - mkdir -p ${PREFIX}/share/doc/${package}-${version}/examples/ - mkdir -p ${PREFIX}/share/man/man1 - mkdir -p ${PREFIX}/examples - mkdir -p ${PREFIX}/share/man/man8 - mkdir -p ${PREFIX}/share/build/m4 + mkdir -p ${DESTDIR}${PREFIX}${prefix}/bin + mkdir -p ${DESTDIR}${PREFIX}${prefix}/sbin + mkdir -p ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbprefix} + mkdir -p ${DESTDIR}${PREFIX}${prefix}/${libdir} + mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}/examples/ + mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/man/man1 + mkdir -p ${DESTDIR}${PREFIX}${prefix}/examples + mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/man/man8 + mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/build/m4 ifdef LB_STANDALONE - ${INSTALL} -m 644 ${c_LIBRARIES} ${PREFIX}/${libdir} + ${INSTALL} -m 644 ${c_LIBRARIES} ${DESTDIR}${PREFIX}${prefix}/${libdir} else - ${INSTALL} -m 644 ${lib_LTLIBRARIES} ${PREFIX}/${libdir} + ${INSTALL} -m 644 ${lib_LTLIBRARIES} ${DESTDIR}${PREFIX}${prefix}/${libdir} endif - ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${PREFIX}/share/doc/${package}-${version} - ( cd ${top_srcdir}/project && ${INSTALL} -m 644 ChangeLog package.description package.summary ${PREFIX}/share/doc/${package}-${version} ) - ${INSTALL} -m 644 ${top_srcdir}/doc/README-notify ${PREFIX}/share/doc/${package}-${version} - (cd ${top_srcdir}/interface && ${INSTALL} -m 644 ${HDRS} ${PREFIX}/include/${globalprefix}/${lbprefix}) - ${INSTALL} -m 644 ${GEN_HDRS} ${PREFIX}/include/${globalprefix}/${lbprefix} + ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} + ( cd ${top_srcdir}/project && ${INSTALL} -m 644 ChangeLog package.description package.summary ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} ) + ${INSTALL} -m 644 ${top_srcdir}/doc/README-notify ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} + (cd ${top_srcdir}/interface && ${INSTALL} -m 644 ${HDRS} ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbprefix}) + ${INSTALL} -m 644 ${GEN_HDRS} ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbprefix} ifndef LB_STANDALONE -# cp -r C CPP ${PREFIX}/share/doc/${package}-${version} -# cp -r ${top_srcdir}/doc/api/{Makefile,api.tex,fig} ${PREFIX}/share/doc/${package}-${version}/api +# cp -r C CPP ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} +# cp -r ${top_srcdir}/doc/api/{Makefile,api.tex,fig} ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}/api endif for p in logevent notify register_sandbox; do \ - ${INSTALL} -m 755 "$$p" "${PREFIX}/bin/glite-lb-$$p"; \ + ${INSTALL} -m 755 "$$p" "${DESTDIR}${PREFIX}${prefix}/bin/glite-lb-$$p"; \ done for p in ${TOOLS} ; do \ - ${INSTALL} -m 755 "$$p" "${PREFIX}/sbin/glite-lb-$$p"; \ + ${INSTALL} -m 755 "$$p" "${DESTDIR}${PREFIX}${prefix}/sbin/glite-lb-$$p"; \ done # TODO: restructuring - do we really need binaries of the examples to be installed? for p in ${EXAMPLES} ${EXAMPLES_PLUS} ${EXAMPLES_CL} ${EXAMPLES_CL_THR} ${sh_PROGS} ; do \ - ${INSTALL} -m 755 "$$p" "${PREFIX}/examples/glite-lb-$$p"; \ + ${INSTALL} -m 755 "$$p" "${DESTDIR}${PREFIX}${prefix}/examples/glite-lb-$$p"; \ done for p in ${EXAMPLES_SRC} ${EXAMPLES_PLUS_SRC} ${EXAMPLES_CL_SRC} ${EXAMPLES_CL_THR_SRC} ; do \ - ${INSTALL} -m 644 "${top_srcdir}/examples/$$p" "${PREFIX}/share/doc/${package}-${version}/examples/"; \ + ${INSTALL} -m 644 "${top_srcdir}/examples/$$p" "${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}/examples/"; \ done - ${INSTALL} -m 644 ${top_srcdir}/examples/Makefile "${PREFIX}/share/doc/${package}-${version}/examples/" - ${INSTALL} -m 644 ${top_srcdir}/examples/README.examples "${PREFIX}/share/doc/${package}-${version}/examples/" - ${INSTALL} -m 755 ${top_srcdir}/src/export.sh "${PREFIX}/sbin/glite-lb-export.sh" - ${INSTALL} -m 755 ${top_srcdir}/examples/notify.pl ${PREFIX}/examples/glite-lb-notify.pl - ${INSTALL} -m 755 ${top_srcdir}/examples/sandbox_transfers.sh ${PREFIX}/examples/glite-lb-sandbox_transfers.sh - ${INSTALL} -m 644 ${MAN_GZ} ${PREFIX}/share/man/man1 - ${INSTALL} -m 644 ${MAN8_GZ} ${PREFIX}/share/man/man8 - ${INSTALL} -m 644 ${top_srcdir}/m4/glite_lb.m4 ${PREFIX}/share/build/m4/ + ${INSTALL} -m 644 ${top_srcdir}/examples/Makefile "${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}/examples/" + ${INSTALL} -m 644 ${top_srcdir}/examples/README.examples "${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}/examples/" + ${INSTALL} -m 755 ${top_srcdir}/src/export.sh "${DESTDIR}${PREFIX}${prefix}/sbin/glite-lb-export.sh" + ${INSTALL} -m 755 ${top_srcdir}/examples/notify.pl ${DESTDIR}${PREFIX}${prefix}/examples/glite-lb-notify.pl + ${INSTALL} -m 755 ${top_srcdir}/examples/sandbox_transfers.sh ${DESTDIR}${PREFIX}${prefix}/examples/glite-lb-sandbox_transfers.sh + ${INSTALL} -m 644 ${MAN_GZ} ${DESTDIR}${PREFIX}${prefix}/share/man/man1 + ${INSTALL} -m 644 ${MAN8_GZ} ${DESTDIR}${PREFIX}${prefix}/share/man/man8 + ${INSTALL} -m 644 ${top_srcdir}/m4/glite_lb.m4 ${DESTDIR}${PREFIX}${prefix}/share/build/m4/ clean: rm -rvf *.o *.lo .libs lib* *.c *.cpp *.h *.dox producer_test notify C/ CPP/ @@ -383,7 +383,7 @@ clean: rm -rvf log.xml project/ rpmbuild/ RPMS/ tgz/ debian/ check_version: - ${CHECK_VERSION} ${stagedir}/include/glite/lb/common_version.h + ${CHECK_VERSION} ${stagedir}${prefix}/include/glite/lb/common_version.h .PHONY: default all compile examples check stage install clean check_version diff --git a/org.glite.lb.common/Makefile b/org.glite.lb.common/Makefile index 46f7d09..3d5f4fb 100644 --- a/org.glite.lb.common/Makefile +++ b/org.glite.lb.common/Makefile @@ -7,6 +7,7 @@ lbprefix=lb package=glite-lb-common version=0.0.0 PREFIX=/opt/glite +prefix= expat_prefix=/opt/expat @@ -18,7 +19,7 @@ jobiddir=${top_srcdir}/../org.glite.jobid.api-c version=${module.version} VPATH=${top_srcdir}/src:${top_srcdir}/interface:${top_srcdir}/test:${top_srcdir}/doc -AT3=${stagedir}/sbin/glite-lb-at3 +AT3=${stagedir}${prefix}/sbin/glite-lb-at3 SUFFIXES = .T @@ -55,7 +56,7 @@ CLASSADS_LIBS?=${classadslib} -lclassad CFLAGS:=${CFLAGS} ${DEBUG} -I${top_srcdir}/src -I${top_srcdir}/interface \ -I. \ -I${top_srcdir}/test \ - -I${stagedir}/include \ + -I${stagedir}${prefix}/include \ ${EXPAT_CFLAGS} \ ${CLASSADS_CFLAGS} \ ${COVERAGE_FLAGS} \ @@ -63,7 +64,7 @@ CFLAGS:=${CFLAGS} ${DEBUG} -I${top_srcdir}/src -I${top_srcdir}/interface \ -DDATAGRID_EXTENSION ${LB_STANDALONE_FLAGS} \ -DBUILDING_LB_COMMON -LDFLAGS:=${LDFLAGS} -L${stagedir}/${libdir} -L${stagedir}/lib \ +LDFLAGS:=${LDFLAGS} -L${stagedir}${prefix}/${libdir} \ ${COVERAGE_FLAGS} EXT_LIBS:= ${EXPAT_LIBS} ${JOBID_LIB} ${TRIO_LIB} ${CLASSADS_LIBS} @@ -74,8 +75,8 @@ ifdef LB_PROF endif COMPILE:=libtool --mode=compile ${CC} -LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/${libdir} ${LDFLAGS} -LINKXX:=libtool --mode=link ${CXX} -rpath ${stagedir}/${libdir} ${LDFLAGS} +LINK:=libtool --mode=link ${CC} -rpath ${stagedir}${prefix}/${libdir} ${LDFLAGS} +LINKXX:=libtool --mode=link ${CXX} -rpath ${stagedir}${prefix}/${libdir} ${LDFLAGS} INSTALL:=libtool --mode=install install OBJS:=${JOBID_OBJS} ${PERF_OBJS} lb_plain_io.o events.o mini_http.o query_rec.o \ @@ -114,9 +115,9 @@ default_commonlib=${NOTHRLTLIB} endif ifdef LB_PERF -STAGE_PERFTEST=mkdir -p ${PREFIX}/examples/perftest; \ - ${INSTALL} -m 644 ${top_srcdir}/examples/*.log ${PREFIX}/examples/perftest; \ - mkdir -p ${PREFIX}/sbin; ${INSTALL} -m 755 ${top_srcdir}/src/perftest_common.sh ${PREFIX}/sbin +STAGE_PERFTEST=mkdir -p ${DESTDIR}${PREFIX}${prefix}/examples/perftest; \ + ${INSTALL} -m 644 ${top_srcdir}/examples/*.log ${DESTDIR}${PREFIX}${prefix}/examples/perftest; \ + mkdir -p ${DESTDIR}${PREFIX}${prefix}/sbin; ${INSTALL} -m 755 ${top_srcdir}/src/perftest_common.sh ${DESTDIR}${PREFIX}${prefix}/sbin else STAGE_PERFTEST=true endif @@ -220,19 +221,19 @@ olddoc: generate events.tex status.tex doxygen CPP.dox install: - mkdir -p ${PREFIX}/${libdir} - mkdir -p ${PREFIX}/share/doc/${package}-${version}/examples - ${INSTALL} -m 644 ${lib_LTLIBRARIES} ${PREFIX}/${libdir} - ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${PREFIX}/share/doc/${package}-${version} - ( cd ${top_srcdir}/project && ${INSTALL} -m 644 ChangeLog package.description package.summary ${PREFIX}/share/doc/${package}-${version} ) -# cp -r C CPP ${PREFIX}/share/doc/${package}-${version} - mkdir -p ${PREFIX}/include/${globalprefix}/${lbprefix} ; - (cd ${top_srcdir}/interface && ${INSTALL} -m 644 ${HDRS} ${PREFIX}/include/${globalprefix}/${lbprefix}) ; - ${INSTALL} -m 644 ${GEN_HDRS} ${PREFIX}/include/${globalprefix}/${lbprefix} ; - ${INSTALL} -m 644 ${lib_LIBRARIES} ${PREFIX}/${libdir}; + mkdir -p ${DESTDIR}${PREFIX}${prefix}/${libdir} + mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}/examples + ${INSTALL} -m 644 ${lib_LTLIBRARIES} ${DESTDIR}${PREFIX}${prefix}/${libdir} + ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} + ( cd ${top_srcdir}/project && ${INSTALL} -m 644 ChangeLog package.description package.summary ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} ) +# cp -r C CPP ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} + mkdir -p ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbprefix} ; + (cd ${top_srcdir}/interface && ${INSTALL} -m 644 ${HDRS} ${PREFIX}${prefix}/include/${globalprefix}/${lbprefix}) ; + ${INSTALL} -m 644 ${GEN_HDRS} ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbprefix} ; + ${INSTALL} -m 644 ${lib_LIBRARIES} ${DESTDIR}${PREFIX}${prefix}/${libdir}; if [ x${LB_STANDALONE} = xyes ]; then \ - mkdir -p ${PREFIX}/include/glite/wmsutils/jobid ; \ - ${INSTALL} -m 644 glite/wmsutils/jobid/*.h ${PREFIX}/include/glite/wmsutils/jobid/ ; \ + mkdir -p ${DESTDIR}${PREFIX}${prefix}/include/glite/wmsutils/jobid ; \ + ${INSTALL} -m 644 glite/wmsutils/jobid/*.h ${DESTDIR}${PREFIX}${prefix}/include/glite/wmsutils/jobid/ ; \ fi ; ${STAGE_PERFTEST} ; diff --git a/org.glite.lb.doc/Makefile b/org.glite.lb.doc/Makefile index 353272f..4b5d965 100644 --- a/org.glite.lb.doc/Makefile +++ b/org.glite.lb.doc/Makefile @@ -6,6 +6,7 @@ lbprefix=lb package=glite-lb-doc version=0.0.0 PREFIX=/opt/glite +prefix= -include Makefile.inc -include ../project/version.properties @@ -22,7 +23,7 @@ LATEX = $(KPATH) latex PDFLATEX = $(KPATH) pdflatex BIBTEX = $(KPATHBIB) bibtex DVIPS = $(KPATH) dvips -AT3=${stagedir}/sbin/glite-lb-at3 +AT3=${stagedir}${prefix}/sbin/glite-lb-at3 INSTALL=install default all: generate doc @@ -61,17 +62,17 @@ check: @echo "No test" install: - -mkdir -p ${PREFIX}/share/doc/${package}-${version}/examples - $(INSTALL) -m 644 ${top_srcdir}/LICENSE ${PREFIX}/share/doc/${package}-${version} - ( cd ${top_srcdir}/project && ${INSTALL} -m 644 ChangeLog package.description package.summary ${PREFIX}/share/doc/${package}-${version} ) - $(INSTALL) -m 644 ${top_srcdir}/src/README ${PREFIX}/share/doc/${package}-${version} - $(INSTALL) -m 644 LBUG.pdf ${PREFIX}/share/doc/${package}-${version} - $(INSTALL) -m 644 LBAG.pdf ${PREFIX}/share/doc/${package}-${version} - $(INSTALL) -m 644 LBDG.pdf ${PREFIX}/share/doc/${package}-${version} + -mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}/examples + ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} + ( cd ${top_srcdir}/project && ${INSTALL} -m 644 ChangeLog package.description package.summary ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} ) + ${INSTALL} -m 644 ${top_srcdir}/src/README ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} + ${INSTALL} -m 644 LBUG.pdf ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} + ${INSTALL} -m 644 LBAG.pdf ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} + ${INSTALL} -m 644 LBDG.pdf ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} # install DG example sources for p in ${top_srcdir}/examples/*; do \ if [ "$$p" == "${top_srcdir}/examples/CVS" ]; then continue; fi; \ - ${INSTALL} -m 644 "$$p" "${PREFIX}/share/doc/${package}-${version}/examples"; \ + ${INSTALL} -m 644 "$$p" "${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}/examples"; \ done clean: diff --git a/org.glite.lb.glite-LB/Makefile b/org.glite.lb.glite-LB/Makefile index 44ed7b7..bf7ef00 100644 --- a/org.glite.lb.glite-LB/Makefile +++ b/org.glite.lb.glite-LB/Makefile @@ -3,6 +3,7 @@ stagedir=. package=glite-lb-yaim version=0.0.0 PREFIX=/opt/glite +prefix= -include Makefile.inc -include ../project/version.properties @@ -16,8 +17,8 @@ default all: echo "NA" > update install: - mkdir -p ${PREFIX}/release/glite-LB - cp -fp LICENSE COPYRIGHT node-version arch service update ${PREFIX}/release/glite-LB/ + 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.harvester/Makefile b/org.glite.lb.harvester/Makefile index 55fe974..5349d48 100644 --- a/org.glite.lb.harvester/Makefile +++ b/org.glite.lb.harvester/Makefile @@ -3,6 +3,8 @@ stagedir=. package=glite-lb-harvester module.version=0.0.0 PREFIX=/opt/glite +prefix= +sysconfdir=/opt/glite/etc globus_prefix=/opt/globus libdir=lib @@ -13,16 +15,16 @@ version:=${module.version} CC=gcc VPATH=${top_srcdir}/src:${top_srcdir}/doc -CPPFLAGS:=-I${stagedir}/include -D_GNU_SOURCE -D_REENTRANT ${CPPFLAGS} +CPPFLAGS:=-I${stagedir}${prefix}/include -D_GNU_SOURCE -D_REENTRANT ${CPPFLAGS} CFLAGS:=-W -Wall -g -O2 ${CFLAGS} LDFLAGS:=${LDFLAGS} ifeq (${thrflavour},) -LIBS:=-L${stagedir}/${libdir} \ +LIBS:=-L${stagedir}${prefix}/${libdir} \ -lglite_lb_common \ -lglite_lb_client \ -lpthread -lglite_security_gss else -LIBS:=-L${stagedir}/${libdir} -L${stagedir}/lib \ +LIBS:=-L${stagedir}${prefix}/${libdir} \ -lglite_lb_common_${thrflavour} \ -lglite_lb_client_${thrflavour} \ -lpthread -lglite_security_gss_${thrflavour} @@ -58,18 +60,18 @@ stage: compile $(MAKE) install PREFIX=${stagedir} install: compile - -mkdir -p ${PREFIX}/bin ${PREFIX}/examples \ - ${PREFIX}/share/doc/${package}-${version} \ - ${PREFIX}/share/man/man8 \ - ${PREFIX}/etc/init.d \ - ${PREFIX}/etc/glite-lb - ${INSTALL} -m 755 harvester ${PREFIX}/bin/glite-lb-harvester - ${INSTALL} -m 755 harvester-dbg ${PREFIX}/examples/glite-lb-harvester-dbg - ${INSTALL} -m 755 ${top_srcdir}/examples/test.sh ${PREFIX}/examples/glite-lb-harvester-test.sh - ${INSTALL} -m 444 ${top_srcdir}/examples/test.sql ${PREFIX}/etc/glite-lb/harvester-test-dbsetup.sql - ${INSTALL} -m 444 ${top_srcdir}/doc/README ${PREFIX}/share/doc/${package}-${version} - ${INSTALL} -m 444 glite-lb-harvester.8 ${PREFIX}/share/man/man8 - ${INSTALL} -m 755 ${top_srcdir}/config/startup ${PREFIX}/etc/init.d/glite-lb-harvester + -mkdir -p ${DESTDIR}${PREFIX}${prefix}/bin ${DESTDIR}${PREFIX}${prefix}/examples \ + ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} \ + ${DESTDIR}${PREFIX}${prefix}/share/man/man8 \ + ${DESTDIR}${PREFIX}${sysconfdir}/init.d \ + ${DESTDIR}${PREFIX}${sysconfdir}/glite-lb + ${INSTALL} -m 755 harvester ${DESTDIR}${PREFIX}${prefix}/bin/glite-lb-harvester + ${INSTALL} -m 755 harvester-dbg ${DESTDIR}${PREFIX}${prefix}/examples/glite-lb-harvester-dbg + ${INSTALL} -m 755 ${top_srcdir}/examples/test.sh ${DESTDIR}${PREFIX}${prefix}/examples/glite-lb-harvester-test.sh + ${INSTALL} -m 444 ${top_srcdir}/examples/test.sql ${DESTDIR}${PREFIX}${sysconfdir}/glite-lb/harvester-test-dbsetup.sql + ${INSTALL} -m 444 ${top_srcdir}/doc/README ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} + ${INSTALL} -m 444 glite-lb-harvester.8 ${DESTDIR}${PREFIX}${prefix}/share/man/man8 + ${INSTALL} -m 755 ${top_srcdir}/config/startup ${DESTDIR}${PREFIX}${prefix}${sysconfdir}/init.d/glite-lb-harvester clean: rm -rfv *.o *.lo *.loT .libs/ manpage.links manpage.refs diff --git a/org.glite.lb.logger-msg/Makefile b/org.glite.lb.logger-msg/Makefile index 0a1d817..519609c 100644 --- a/org.glite.lb.logger-msg/Makefile +++ b/org.glite.lb.logger-msg/Makefile @@ -36,7 +36,7 @@ CPPUNIT_CFLAGS?=-I${cppunit_prefix}/include DEBUG:=-g -O0 CFLAGS:=${CFLAGS} ${DEBUG} \ - -I${stagedir}/include -I${top_srcdir}/src \ + -I${stagedir}${prefix}/include -I${top_srcdir}/src \ ${ACTIVEMQ_CFLAGS} \ ${APR_CFLAGS} \ ${APR_UTIL_CFLAGS} \ @@ -44,7 +44,7 @@ CFLAGS:=${CFLAGS} ${DEBUG} \ ${COVERAGE_FLAGS} \ ${VERSION} ${LB_STANDALONE_FLAGS} ${LB_PERF_FLAGS} -LDFLAGS:=${LDFLAGS} -L${stagedir}/${libdir} \ +LDFLAGS:=${LDFLAGS} -L${stagedir}${prefix}/${libdir} \ -L${aprutil_prefix}/${libdir} \ -L${apr_prefix}/${libdir} \ ${COVERAGE_FLAGS} @@ -52,9 +52,9 @@ LDFLAGS:=${LDFLAGS} -L${stagedir}/${libdir} \ COMPILE:=libtool --mode=compile ${CC} ${CFLAGS} COMPILEXX:=libtool --mode=compile ${CXX} ${CFLAGS} LINK:=libtool --mode=link ${CC} ${LDFLAGS} -LINKXX:=libtool --mode=link ${CXX} -rpath ${stagedir}/${libdir} ${LDFLAGS} +LINKXX:=libtool --mode=link ${CXX} -rpath ${stagedir}${prefix}/${libdir} ${LDFLAGS} INSTALL:=libtool --mode=install install -SOLINK:=libtool --mode=link ${CXX} -module ${LDFLAGS} -rpath ${stagedir}/${libdir} +SOLINK:=libtool --mode=link ${CXX} -module ${LDFLAGS} -rpath ${stagedir}${prefix}/${libdir} #ifneq (${expat_prefix},/usr) # EXPAT_LIBS:=-L${expat_prefix}/lib @@ -101,13 +101,13 @@ check: # ./check.ll install: - -mkdir -p ${PREFIX}/${libdir} - -mkdir -p ${PREFIX}/share/man/man8 - -mkdir -p ${PREFIX}/share/doc/${package}-${version} - ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${PREFIX}/share/doc/${package}-${version} - ${INSTALL} -m 755 ${PLUGIN_LIB} ${PREFIX}/${libdir} - ( cd ${top_srcdir}/project && ${INSTALL} -m 644 ChangeLog package.description package.summary ${PREFIX}/share/doc/${package}-${version} ) -# ${INSTALL} -m 644 ${MAN_GZ} ${PREFIX}/share/man/man8 + -mkdir -p ${DESTDIR}${PREFIX}${prefix}/${libdir} + -mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/man/man8 + -mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} + ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} + ${INSTALL} -m 755 ${PLUGIN_LIB} ${DESTDIR}${PREFIX}${prefix}/${libdir} + ( cd ${top_srcdir}/project && ${INSTALL} -m 644 ChangeLog package.description package.summary ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} ) +# ${INSTALL} -m 644 ${MAN_GZ} ${DESTDIR}${PREFIX}${prefix}/share/man/man8 %.lo %.o: %.cpp ${COMPILEXX} -c $< -o $@ diff --git a/org.glite.lb.logger/Makefile b/org.glite.lb.logger/Makefile index c988528..c245a78 100644 --- a/org.glite.lb.logger/Makefile +++ b/org.glite.lb.logger/Makefile @@ -6,6 +6,8 @@ lbprefix=lb package=glite-lb-client version=0.0.0 PREFIX=/opt/glite +prefix= +sysconfdir=/opt/glite/etc -include Makefile.inc -include ../project/version.properties @@ -48,17 +50,17 @@ endif DEBUG:=-g -O0 CFLAGS:=${CFLAGS} ${DEBUG} \ - -I${stagedir}/include -I${top_srcdir}/src -I${top_srcdir}/interface \ + -I${stagedir}${prefix}/include -I${top_srcdir}/src -I${top_srcdir}/interface \ -D_GNU_SOURCE \ ${COVERAGE_FLAGS} \ ${VERSION} ${LB_STANDALONE_FLAGS} ${LB_PERF_FLAGS} -LDFLAGS:=${LDFLAGS} -L${stagedir}/${libdir} \ +LDFLAGS:=${LDFLAGS} -L${stagedir}${prefix}/${libdir} \ ${COVERAGE_FLAGS} COMPILE:=libtool --mode=compile ${CC} -LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/${libdir} ${LDFLAGS} -LINKXX:=libtool --mode=link ${CXX} -rpath ${stagedir}/${libdir} ${LDFLAGS} +LINK:=libtool --mode=link ${CC} -rpath ${stagedir}${prefix}/${libdir} ${LDFLAGS} +LINKXX:=libtool --mode=link ${CXX} -rpath ${stagedir}${prefix}/${libdir} ${LDFLAGS} INSTALL:=libtool --mode=install install #ifneq (${expat_prefix},/usr) @@ -180,24 +182,24 @@ check.il: ${INTERLOG_TEST_OBJS} ${LINKXX} -o $@ ${COMMON_LIB}${default_thrflavour} ${CPPUNIT_LIBS} ${EXT_LIB} -lpthread $+ install: - -mkdir -p ${PREFIX}/bin - -mkdir -p ${PREFIX}/etc/init.d - -mkdir -p ${PREFIX}/share/doc/${package}-${version} - -mkdir -p ${PREFIX}/share/man/man8 - -mkdir -p ${PREFIX}/include/glite/lb - ${INSTALL} -m 755 ${LOGD} ${PREFIX}/bin - ${INSTALL} -m 755 ${INTERLOGD} ${PREFIX}/bin - ${INSTALL} -m 755 ${NOTIF_INTERLOGD} ${PREFIX}/bin + -mkdir -p ${DESTDIR}${PREFIX}${prefix}/bin + -mkdir -p ${DESTDIR}${PREFIX}${sysconfdir}/init.d + -mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} + -mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/man/man8 + -mkdir -p ${DESTDIR}${PREFIX}${prefix}/include/glite/lb + ${INSTALL} -m 755 ${LOGD} ${DESTDIR}${PREFIX}${prefix}/bin + ${INSTALL} -m 755 ${INTERLOGD} ${DESTDIR}${PREFIX}${prefix}/bin + ${INSTALL} -m 755 ${NOTIF_INTERLOGD} ${DESTDIR}${PREFIX}${prefix}/bin ifdef LB_PERF - -mkdir -p ${PREFIX}/sbin - ${INSTALL} -m 755 ${top_srcdir}/src/perftest_ll.sh ${PREFIX}/sbin - ${INSTALL} -m 755 ${top_srcdir}/src/perftest_il.sh ${PREFIX}/sbin + -mkdir -p ${DESTDIR}${PREFIX}${prefix}/sbin + ${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 ${PREFIX}/etc/init.d/glite-lb-locallogger - ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${PREFIX}/share/doc/${package}-${version} - ( cd ${top_srcdir}/interface && ${INSTALL} -m 644 ${HDRS} ${PREFIX}/include/${globalprefix}/${lbprefix} ) - ( cd ${top_srcdir}/project && ${INSTALL} -m 644 ChangeLog package.description package.summary ${PREFIX}/share/doc/${package}-${version} ) - ${INSTALL} -m 644 ${MAN_GZ} ${PREFIX}/share/man/man8 + ${INSTALL} -m 755 ${top_srcdir}/config/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} ) + ${INSTALL} -m 644 ${MAN_GZ} ${DESTDIR}${PREFIX}${prefix}/share/man/man8 ${INTERLOG_NOTIF_OBJS}: %.notif.lo: %.c ${COMPILE} ${CFLAGS} -DIL_NOTIFICATIONS -c $< -o $@ diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile index c377a8a..4be58d1 100644 --- a/org.glite.lb.server/Makefile +++ b/org.glite.lb.server/Makefile @@ -6,6 +6,8 @@ lbprefix=lb package=glite-lb-server version=0.2.0 PREFIX=/opt/glite +prefix= +sysconfdir=/opt/glite/etc # gridsite requires openssl libraries, we want to include the ones from globus globus_prefix=/opt/globus @@ -56,7 +58,7 @@ ifeq ($(gsoap_version),2.7.0) else VPATH=${top_srcdir}/interface:${top_srcdir}/src:${top_srcdir}/test:${top_srcdir}/doc:${top_srcdir}/examples:${top_srcdir}/project endif -AT3=${stagedir}/sbin/glite-lb-at3 +AT3=${stagedir}${prefix}/sbin/glite-lb-at3 SUFFIXES = .T @@ -109,7 +111,7 @@ CFLAGS:= ${CFLAGS} \ ${WS_CFLAGS} ${DEBUG} \ -DVERSION=\"${version}\" \ ${GSOAP_CFLAGS} \ - -I${stagedir}/include -I${top_srcdir}/src -I. \ + -I${stagedir}${prefix}/include -I${top_srcdir}/src -I. \ -I${top_srcdir}/interface \ ${EXPAT_CFLAGS} \ ${LIBCARES_CFLAGS} \ @@ -122,20 +124,20 @@ CFLAGS:= ${CFLAGS} \ CXXFLAGS:=${CFLAGS} ifdef LB_PROF - SRVBONES_LIB:= ${stagedir}/${libdir}/libglite_lbu_server_bones.la - LB_COMMON_LIB:=${stagedir}/${libdir}/libglite_lb_common${default_flavour}.la - LB_UTILS_DB_LIB:=${stagedir}/${libdir}/libglite_lbu_db.la + SRVBONES_LIB:= ${stagedir}${prefix}/${libdir}/libglite_lbu_server_bones.la + LB_COMMON_LIB:=${stagedir}${prefix}/${libdir}/libglite_lb_common${default_flavour}.la + LB_UTILS_DB_LIB:=${stagedir}${prefix}/${libdir}/libglite_lbu_db.la CFLAGS:=${CFLAGS} -pg -g LDFLAGS:=${LDFLAGS} -pg else - SRVBONES_LIB:= -L${stagedir}/${libdir} -lglite_lbu_server_bones - LB_COMMON_LIB:=-L${stagedir}/${libdir} -lglite_lb_common${default_flavour} - LB_UTILS_DB_LIB:=-L${stagedir}/${libdir} -lglite_lbu_db - LDFLAGS:=${LDFLAGS} -L${stagedir}/${libdir} + SRVBONES_LIB:= -L${stagedir}${prefix}/${libdir} -lglite_lbu_server_bones + LB_COMMON_LIB:=-L${stagedir}${prefix}/${libdir} -lglite_lb_common${default_flavour} + LB_UTILS_DB_LIB:=-L${stagedir}${prefix}/${libdir} -lglite_lbu_db + LDFLAGS:=${LDFLAGS} -L${stagedir}${prefix}/${libdir} endif -# LB_MACHINE_LIB:=${stagedir}/${libdir}/libglite_lb_statemachine.a -LB_MACHINE_LIB:=-L${stagedir}/${libdir} -lglite_lb_statemachine +# LB_MACHINE_LIB:=${stagedir}${prefix}/${libdir}/libglite_lb_statemachine.a +LB_MACHINE_LIB:=-L${stagedir}${prefix}/${libdir} -lglite_lb_statemachine ifdef LBS_DB_PROFILE CFLAGS:=${CFLAGS} -DLBS_DB_PROFILE @@ -143,10 +145,10 @@ endif COMPILE:=libtool --mode=compile ${CC} ${CFLAGS} CXXCOMPILE:=libtool --mode=compile ${CXX} ${CXXFLAGS} -LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/${libdir} ${LDFLAGS} -SOLINK:=libtool --mode=link ${CC} -module ${LDFLAGS} -rpath ${stagedir}/${libdir} +LINK:=libtool --mode=link ${CC} -rpath ${stagedir}${prefix}/${libdir} ${LDFLAGS} +SOLINK:=libtool --mode=link ${CC} -module ${LDFLAGS} -rpath ${stagedir}${prefix}/${libdir} INSTALL:=libtool --mode=install install -LINKXX:=libtool --mode=link ${CXX} -rpath ${stagedir}/${libdir} ${LDFLAGS} +LINKXX:=libtool --mode=link ${CXX} -rpath ${stagedir}${prefix}/${libdir} ${LDFLAGS} XSLTPROC:=xsltproc --novalid gsoap_bin_prefix:=${shell if [ -x ${gsoap_prefix}/bin/soapcpp2 ]; then echo ${gsoap_prefix}/bin; else echo ${gsoap_prefix}; fi } @@ -159,7 +161,7 @@ EXT_LIBS:= \ ${LCAS_LIBS} \ ${VOMS_LIBS} -COMMON_LIBS:= -L${stagedir}/${libdir} -lglite_lb_common${default_flavour} -lglite_security_gss${default_flavour} -lglite_lbu_trio -lglite_lbu_maildir -lglite_lbu_log +COMMON_LIBS:= -L${stagedir}${prefix}/${libdir} -lglite_lb_common${default_flavour} -lglite_security_gss${default_flavour} -lglite_lbu_trio -lglite_lbu_maildir -lglite_lbu_log BKSERVER_BASE_OBJS:= \ bkserverd.o il_lbproxy.o get_events.o index.o jobstat.o jobstat_supp.o \ @@ -173,10 +175,10 @@ BKSERVER_BASE_OBJS:= \ gsoap_version ?= ${gsoap_default_version} dotless_gsoap_ver:=${shell echo ${gsoap_version} | tr -d . } -ifeq ($(shell test -f ${stagedir}/${libdir}/libglite_security_gsoap_plugin_${dotless_gsoap_ver}${default_flavour}_c.so && echo ok),ok) +ifeq ($(shell test -f ${stagedir}${prefix}/${libdir}/libglite_security_gsoap_plugin_${dotless_gsoap_ver}${default_flavour}_c.so && echo ok),ok) langflavour:=_c endif -GSOAP_LIB:=-L${stagedir}/${libdir} -lglite_security_gsoap_plugin_${dotless_gsoap_ver}${default_flavour}${langflavour} +GSOAP_LIB:=-L${stagedir}${prefix}/${libdir} -lglite_security_gsoap_plugin_${dotless_gsoap_ver}${default_flavour}${langflavour} ifeq ($(GLITE_LB_SERVER_WITH_WS),yes) BKSERVER_OBJS:= \ @@ -275,13 +277,13 @@ ${GSOAP_FILES_PREFIX}H.h ${GSOAP_FILES_PREFIX}C.c ${GSOAP_FILES_PREFIX}Server.c # try several times -- LB.wsdl downloads BaseFault.xsd from www.ibm.com which may be failing # not used right now but may be useful one day # LB.xh: ws_typemap.dat -# ${gsoap_prefix}/bin/wsdl2h -c -t ${top_srcdir}/src/ws_typemap.dat -o $@ ${stagedir}/interface/LB.wsdl || \ -# { sleep 1 ; ${gsoap_prefix}/bin/wsdl2h -c -t ${top_srcdir}/src/ws_typemap.dat -o $@ ${stagedir}/interface/LB.wsdl; } || \ -# { sleep 4 ; ${gsoap_prefix}/bin/wsdl2h -c -t ${top_srcdir}/src/ws_typemap.dat -o $@ ${stagedir}/interface/LB.wsdl; } || \ -# { sleep 16 ; ${gsoap_prefix}/bin/wsdl2h -c -t ${top_srcdir}/src/ws_typemap.dat -o $@ ${stagedir}/interface/LB.wsdl; } +# ${gsoap_prefix}/bin/wsdl2h -c -t ${top_srcdir}/src/ws_typemap.dat -o $@ ${stagedir}${prefix}/interface/LB.wsdl || \ +# { sleep 1 ; ${gsoap_prefix}/bin/wsdl2h -c -t ${top_srcdir}/src/ws_typemap.dat -o $@ ${stagedir}${prefix}/interface/LB.wsdl; } || \ +# { sleep 4 ; ${gsoap_prefix}/bin/wsdl2h -c -t ${top_srcdir}/src/ws_typemap.dat -o $@ ${stagedir}${prefix}/interface/LB.wsdl; } || \ +# { sleep 16 ; ${gsoap_prefix}/bin/wsdl2h -c -t ${top_srcdir}/src/ws_typemap.dat -o $@ ${stagedir}${prefix}/interface/LB.wsdl; } -LB.xh: ws_typemap.dat ${stagedir}/interface/LB.wsdl - ${gsoap_bin_prefix}/wsdl2h -c -t ${top_srcdir}/src/ws_typemap.dat -I${stagedir}/interface -o $@ ${stagedir}/interface/LB.wsdl +LB.xh: ws_typemap.dat ${stagedir}${prefix}/interface/LB.wsdl + ${gsoap_bin_prefix}/wsdl2h -c -t ${top_srcdir}/src/ws_typemap.dat -I${stagedir}${prefix}/interface -o $@ ${stagedir}${prefix}/interface/LB.wsdl test.xml: test_xml LD_LIBRARY_PATH=${cares_prefix}/${libdir}:${classads_prefix}/${libdir}:${LD_LIBRARY_PATH} ./test_xml @@ -329,38 +331,38 @@ stage: compile $(MAKE) install PREFIX=${stagedir} DOSTAGE=yes install: - -mkdir -p ${PREFIX}/bin ${PREFIX}/etc/glite-lb ${PREFIX}/etc/init.d ${PREFIX}/interface - -mkdir -p ${PREFIX}/share/doc/${package}-${version} - -mkdir -p ${PREFIX}/share/man/man1 - -mkdir -p ${PREFIX}/${libdir} - -mkdir -p ${PREFIX}/include/${globalprefix}/${lbprefix} - mkdir -p ${PREFIX}/share/man/man8 - ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${PREFIX}/share/doc/${package}-${version} - ( cd ${top_srcdir}/project && ${INSTALL} -m 644 ChangeLog package.description package.summary ${PREFIX}/share/doc/${package}-${version} ) - ${INSTALL} -m 644 ${MAN_GZ} ${PREFIX}/share/man/man1 + -mkdir -p ${DESTDIR}${PREFIX}${prefix}/bin ${DESTDIR}${PREFIX}${sysconfdir}/glite-lb ${DESTDIR}${PREFIX}${sysconfdir}/init.d + -mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} + -mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/man/man1 + -mkdir -p ${DESTDIR}${PREFIX}${prefix}/${libdir} + -mkdir -p ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbprefix} + mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/man/man8 + ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} + ( cd ${top_srcdir}/project && ${INSTALL} -m 644 ChangeLog package.description package.summary ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} ) + ${INSTALL} -m 644 ${MAN_GZ} ${DESTDIR}${PREFIX}${prefix}/share/man/man1 for p in bkserverd bkindex mon-db; do \ - ${INSTALL} -m 755 "glite-lb-$$p" "${PREFIX}/bin/glite-lb-$$p"; \ + ${INSTALL} -m 755 "glite-lb-$$p" "${DESTDIR}${PREFIX}${prefix}/bin/glite-lb-$$p"; \ done - -mkdir -p ${PREFIX}/${libdir}/modules - ${INSTALL} -m 755 ${LCAS_PLUGIN_LIB} ${PREFIX}/${libdir}/modules - ln -sf liblcas_lb.so ${PREFIX}/${libdir}/modules/lcas_lb.mod + -mkdir -p ${DESTDIR}${PREFIX}${prefix}/${libdir}/modules + ${INSTALL} -m 755 ${LCAS_PLUGIN_LIB} ${DESTDIR}${PREFIX}${prefix}/${libdir}/modules + ln -sf liblcas_lb.so ${DESTDIR}${PREFIX}${prefix}/${libdir}/modules/lcas_lb.mod for f in dbsetup.sql index.conf.template; do \ - ${INSTALL} -m 644 ${top_srcdir}/config/"glite-lb-$$f" ${PREFIX}/etc/glite-lb; \ - ln -sf "glite-lb/glite-lb-$$f" "${PREFIX}/etc/glite-lb-$$f"; \ + ${INSTALL} -m 644 ${top_srcdir}/config/"glite-lb-$$f" ${DESTDIR}${PREFIX}${sysconfdir}/glite-lb; \ + ln -sf "glite-lb/glite-lb-$$f" "${DESTDIR}${PREFIX}${sysconfdir}/glite-lb-$$f"; \ done - ${INSTALL} -m 755 ${top_srcdir}/config/glite-lb-migrate_db2version20 ${PREFIX}/etc/glite-lb + ${INSTALL} -m 755 ${top_srcdir}/config/glite-lb-migrate_db2version20 ${DESTDIR}${PREFIX}${sysconfdir}/glite-lb - ${INSTALL} -m 755 ${top_srcdir}/config/startup ${PREFIX}/etc/init.d/glite-lb-bkserverd + ${INSTALL} -m 755 ${top_srcdir}/config/startup ${DESTDIR}${PREFIX}${sysconfdir}/init.d/glite-lb-bkserverd - mkdir -p ${PREFIX}/include/${globalprefix}/${lbprefix} - (cd ${top_srcdir}/interface && install -m 644 ${HDRS} ${PREFIX}/include/${globalprefix}/${lbprefix}) - install -m 644 ${STATIC_LIB_BK} ${PREFIX}/${libdir} - ${INSTALL} -m 644 ${top_srcdir}/interface/srv_perf.h ${PREFIX}/include/${globalprefix}/${lbprefix} - ${INSTALL} -m 644 ${MAN_GZ} ${PREFIX}/share/man/man8 + mkdir -p ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbprefix} + (cd ${top_srcdir}/interface && install -m 644 ${HDRS} ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbprefix}) + install -m 644 ${STATIC_LIB_BK} ${DESTDIR}${PREFIX}${prefix}/${libdir} + ${INSTALL} -m 644 ${top_srcdir}/interface/srv_perf.h ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbprefix} + ${INSTALL} -m 644 ${MAN_GZ} ${DESTDIR}${PREFIX}${prefix}/share/man/man8 ifdef LB_PERF - -mkdir -p ${PREFIX}/sbin - ${INSTALL} -m 755 ${top_srcdir}/src/perftest_proxy.sh ${PREFIX}/sbin + -mkdir -p ${DESTDIR}${PREFIX}${prefix}/sbin + ${INSTALL} -m 755 ${top_srcdir}/src/perftest_proxy.sh ${DESTDIR}${PREFIX}${prefix}/sbin endif clean: diff --git a/org.glite.lb.state-machine/Makefile b/org.glite.lb.state-machine/Makefile index b94253d..7d8f6f7 100644 --- a/org.glite.lb.state-machine/Makefile +++ b/org.glite.lb.state-machine/Makefile @@ -7,6 +7,7 @@ lbprefix=lb package=glite-lb-state-machine version=0.2.0 PREFIX=/opt/glite +prefix= -include Makefile.inc @@ -16,7 +17,7 @@ default all: compile CC=gcc CXX=g++ -AT3=${stagedir}/sbin/glite-lb-at3 +AT3=${stagedir}${prefix}/sbin/glite-lb-at3 SUFFIXES = .T @@ -36,15 +37,15 @@ DEBUG:=-g -O0 -Wall CFLAGS:= ${CFLAGS} \ ${DEBUG} \ ${CLASSADS_CFLAGS} \ - -I${stagedir}/include -I${top_srcdir}/src -I. \ + -I${stagedir}${prefix}/include -I${top_srcdir}/src -I. \ -I${top_srcdir}/interface COMPILE:=libtool --mode=compile ${CC} ${CFLAGS} -LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/${libdir} ${LDFLAGS} -SOLINK:=libtool --mode=link ${CC} -module ${LDFLAGS} -rpath ${stagedir}/${libdir} +LINK:=libtool --mode=link ${CC} -rpath ${stagedir}${prefix}/${libdir} ${LDFLAGS} +SOLINK:=libtool --mode=link ${CC} -module ${LDFLAGS} -rpath ${stagedir}${prefix}/${libdir} LINKXX:=libtool --mode=link ${CXX} ${LDFLAGS} INSTALL:=libtool --mode=install install -LINKXX:=libtool --mode=link ${CXX} -rpath ${stagedir}/${libdir} ${LDFLAGS} +LINKXX:=libtool --mode=link ${CXX} -rpath ${stagedir}${prefix}/${libdir} ${LDFLAGS} XSLTPROC:=xsltproc --novalid ifeq (${thrflavour},) @@ -52,8 +53,8 @@ default_flavour= else default_flavour=_${nothrflavour} endif -COMMON_LIBS:= -L${stagedir}/${libdir} -lglite_lb_common${default_flavour} -lglite_security_gss${defaultflavour} -PLUGIN_LIBS:= -L${stagedir}/${libdir} -lglite_lb_common${default_flavour} \ +COMMON_LIBS:= -L${stagedir}${prefix}/${libdir} -lglite_lb_common${default_flavour} -lglite_security_gss${defaultflavour} +PLUGIN_LIBS:= -L${stagedir}${prefix}/${libdir} -lglite_lb_common${default_flavour} \ ${CLASSADS_LIBS} -lstdc++ ${EXPAT_LIBS} PLUGIN_LOBJS:=seqcode_aux.lo process_event.lo process_event_pbs.lo process_event_condor.lo process_event_cream.lo lb_plugin.lo process_event_file_transfer.lo process_event_file_transfer_collection.lo @@ -82,18 +83,18 @@ stage: compile $(MAKE) install PREFIX=${stagedir} install: - -mkdir -p ${PREFIX}/${libdir} ${PREFIX}/interface ${PREFIX}/include/glite/lb - install -m 644 ${MACHINE_LIB} ${PREFIX}/${libdir} - ${INSTALL} -m 755 ${PLUGIN_LIB} ${PREFIX}/${libdir} - install -m 644 ${top_srcdir}/interface/lb-job-attrs.xsd ${PREFIX}/interface - install -m 644 lb-job-attrs2.xsd ${PREFIX}/interface - install -m 644 ${top_srcdir}/interface/lb-job-record.xsd ${PREFIX}/interface - install -m 644 ${top_srcdir}/interface/intjobstat.h ${PREFIX}/include/glite/lb - install -m 644 ${top_srcdir}/interface/intjobstat_supp.h ${PREFIX}/include/glite/lb - install -m 644 ${top_srcdir}/interface/process_event.h ${PREFIX}/include/glite/lb - install -m 644 ${top_srcdir}/interface/seqcode_aux.h ${PREFIX}/include/glite/lb - install -m 644 job_attrs.h ${PREFIX}/include/glite/lb - install -m 644 job_attrs2.h ${PREFIX}/include/glite/lb + -mkdir -p ${DESTDIR}${PREFIX}${prefix}/${libdir} ${DESTDIR}${PREFIX}${prefix}/interface ${DESTDIR}${PREFIX}${prefix}/include/glite/lb + install -m 644 ${MACHINE_LIB} ${DESTDIR}${PREFIX}${prefix}/${libdir} + ${INSTALL} -m 755 ${PLUGIN_LIB} ${DESTDIR}${PREFIX}${prefix}/${libdir} + install -m 644 ${top_srcdir}/interface/lb-job-attrs.xsd ${DESTDIR}${PREFIX}${prefix}/interface + install -m 644 lb-job-attrs2.xsd ${DESTDIR}${PREFIX}${prefix}/interface + install -m 644 ${top_srcdir}/interface/lb-job-record.xsd ${DESTDIR}${PREFIX}${prefix}/interface + install -m 644 ${top_srcdir}/interface/intjobstat.h ${DESTDIR}${PREFIX}${prefix}/include/glite/lb + install -m 644 ${top_srcdir}/interface/intjobstat_supp.h ${DESTDIR}${PREFIX}${prefix}/include/glite/lb + install -m 644 ${top_srcdir}/interface/process_event.h ${DESTDIR}${PREFIX}${prefix}/include/glite/lb + install -m 644 ${top_srcdir}/interface/seqcode_aux.h ${DESTDIR}${PREFIX}${prefix}/include/glite/lb + install -m 644 job_attrs.h ${DESTDIR}${PREFIX}${prefix}/include/glite/lb + install -m 644 job_attrs2.h ${DESTDIR}${PREFIX}${prefix}/include/glite/lb clean: rm -rvf .libs *.o *.lo ${PLUGIN_LIB} ${MACHINE_LIB} diff --git a/org.glite.lb.types/Makefile b/org.glite.lb.types/Makefile index efd56c0..29733a0 100644 --- a/org.glite.lb.types/Makefile +++ b/org.glite.lb.types/Makefile @@ -19,11 +19,11 @@ stage: compile $(MAKE) install PREFIX=${stagedir} install: compile - mkdir -p ${PREFIX}/share/perl/gLite/LB ${PREFIX}/share/lb/at3 ${PREFIX}/sbin - install -m 644 ${PM} ${PREFIX}/share/perl/gLite/LB - install -m 644 ${T} ${PREFIX}/share/lb/at3 + mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/perl/gLite/LB ${DESTDIR}${PREFIX}${prefix}/share/glite-lb/at3 ${DESTDIR}${PREFIX}${prefix}/sbin + install -m 644 ${PM} ${DESTDIR}${PREFIX}${prefix}/share/perl/gLite/LB + install -m 644 ${T} ${DESTDIR}${PREFIX}${prefix}/share/glite-lb/at3 for p in ${SCRIPTS} ; do \ - install -m 755 "$$p" "${PREFIX}/sbin/glite-lb-$$p"; \ + install -m 755 "$$p" "${DESTDIR}${PREFIX}${prefix}/sbin/glite-lb-$$p"; \ done clean: diff --git a/org.glite.lb.types/at3.in b/org.glite.lb.types/at3.in index 2d5a866..2d1a595 100755 --- a/org.glite.lb.types/at3.in +++ b/org.glite.lb.types/at3.in @@ -27,10 +27,10 @@ BEGIN{ $prefix = dirname($0)."/.."; } use lib "$prefix/share/perl"; use gLite::LB::MultiStruct; -require "$prefix/share/lb/at3/types.T"; +require "$prefix/share/glite-lb/at3/types.T"; -my $eventsn = "$prefix/share/lb/at3/events.T"; -my $statusn = "$prefix/share/lb/at3/status.T"; +my $eventsn = "$prefix/share/glite-lb/at3/events.T"; +my $statusn = "$prefix/share/glite-lb/at3/status.T"; my $indent = ''; diff --git a/org.glite.lb.utils/Makefile b/org.glite.lb.utils/Makefile index 8bf872c..0c94660 100644 --- a/org.glite.lb.utils/Makefile +++ b/org.glite.lb.utils/Makefile @@ -6,6 +6,7 @@ lbprefix=lb package=glite-lb-utils version=0.0.0 PREFIX=/opt/glite +prefix= expat_prefix=/opt/expat gsoap_prefix=/opt/gsoap @@ -18,7 +19,7 @@ version=${module.version} VPATH=${top_srcdir}/src:${top_srcdir}/doc CC=gcc -AT3=${stagedir}/sbin/glite-lb-at3 +AT3=${stagedir}${prefix}/sbin/glite-lb-at3 SUFFIXES = .T @@ -34,20 +35,20 @@ GSOAP_CFLAGS?=-I${gsoap_prefix}/include -I${gsoap_prefix}/ CFLAGS:= ${CFLAGS} \ ${WS_CFLAGS} ${DEBUG} \ -DVERSION=\"${version}\" \ - -I${stagedir}/include -I${top_srcdir}/src -I. \ + -I${stagedir}${prefix}/include -I${top_srcdir}/src -I. \ -I${top_srcdir}/interface \ ${EXPAT_CFLAGS} \ ${GSOAP_CFLAGS} \ ${COVERAGE_FLAGS} \ -D_GNU_SOURCE -LDFLAGS:=${LDFLAGS} -L${stagedir}/${libdir} +LDFLAGS:=${LDFLAGS} -L${stagedir}${prefix}/${libdir} COMPILE:=libtool --mode=compile ${CC} ${CFLAGS} -LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/${libdir} ${LDFLAGS} -SOLINK:=libtool --mode=link ${CC} -module ${LDFLAGS} -rpath ${stagedir}/${libdir} +LINK:=libtool --mode=link ${CC} -rpath ${stagedir}${prefix}/${libdir} ${LDFLAGS} +SOLINK:=libtool --mode=link ${CC} -module ${LDFLAGS} -rpath ${stagedir}${prefix}/${libdir} LINKXX:=libtool --mode=link ${CXX} ${LDFLAGS} INSTALL:=libtool --mode=install install -LINKXX:=libtool --mode=link ${CXX} -rpath ${stagedir}/${libdir} ${LDFLAGS} +LINKXX:=libtool --mode=link ${CXX} -rpath ${stagedir}${prefix}/${libdir} ${LDFLAGS} XSLTPROC:=xsltproc --novalid EXT_LIBS:= ${EXPAT_LIBS} @@ -101,20 +102,20 @@ stage: compile $(MAKE) install PREFIX=${stagedir} DOSTAGE=yes install: - -mkdir -p ${PREFIX}/bin - -mkdir -p ${PREFIX}/${libdir} - -mkdir -p ${PREFIX}/share/doc/${package}-${version} - -mkdir -p ${PREFIX}/share/man/man1 - -mkdir -p ${PREFIX}/share/man/man8 - ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${PREFIX}/share/doc/${package}-${version} - ( cd ${top_srcdir}/project && ${INSTALL} -m 644 ChangeLog package.description package.summary ${PREFIX}/share/doc/${package}-${version} ) - ${INSTALL} -m 644 ${top_srcdir}/doc/README* ${PREFIX}/share/doc/${package}-${version} - ${INSTALL} -m 644 ${MAN_GZ} ${PREFIX}/share/man/man1 - ${INSTALL} -m 644 ${MAN8_GZ} ${PREFIX}/share/man/man8 - ${INSTALL} -m 755 ${top_srcdir}/src/glite-lb-bkpurge-offline.sh ${PREFIX}/bin/glite-lb-bkpurge-offline + -mkdir -p ${DESTDIR}${PREFIX}${prefix}/bin + -mkdir -p ${DESTDIR}${PREFIX}${prefix}/${libdir} + -mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} + -mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/man/man1 + -mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/man/man8 + ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} + ( cd ${top_srcdir}/project && ${INSTALL} -m 644 ChangeLog package.description package.summary ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} ) + ${INSTALL} -m 644 ${top_srcdir}/doc/README* ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} + ${INSTALL} -m 644 ${MAN_GZ} ${DESTDIR}${PREFIX}${prefix}/share/man/man1 + ${INSTALL} -m 644 ${MAN8_GZ} ${DESTDIR}${PREFIX}${prefix}/share/man/man8 + ${INSTALL} -m 755 ${top_srcdir}/src/glite-lb-bkpurge-offline.sh ${DESTDIR}${PREFIX}${prefix}/bin/glite-lb-bkpurge-offline for p in ${ALLUTILS} ; do \ - ${INSTALL} -m 755 "$$p" "${PREFIX}/bin/glite-lb-$$p"; \ + ${INSTALL} -m 755 "$$p" "${DESTDIR}${PREFIX}${prefix}/bin/glite-lb-$$p"; \ done clean: diff --git a/org.glite.lb.ws-interface/Makefile b/org.glite.lb.ws-interface/Makefile index af2708e..2a9946b 100644 --- a/org.glite.lb.ws-interface/Makefile +++ b/org.glite.lb.ws-interface/Makefile @@ -8,6 +8,7 @@ lbprefix=lb package=glite-lb-ws-interface version=0.0.0 PREFIX=/opt/glite +prefix= -include Makefile.inc -include ../project/version.properties @@ -17,7 +18,7 @@ version=${module.version} SUFFIXES = .T VPATH=${top_srcdir}/src -AT3=${stagedir}/sbin/glite-lb-at3 +AT3=${stagedir}${prefix}/sbin/glite-lb-at3 XSLTPROC:=xsltproc --nonet XMLLINT:=xmllint --nonet TIDY=tidy -i -q --show-warnings no --tidy-mark no --wrap 0 @@ -39,23 +40,23 @@ glue2-copy.xsd: wget -O $@ http://schemas.ogf.org/glue/2008/05/spec_2.0_d42_r01 || cp ${top_srcdir}/src/glue2.xsd $@ install: - -mkdir -p ${PREFIX}/${STAGETO} - -mkdir -p ${PREFIX}/share/doc/${package}-${version}/examples - -mkdir -p ${PREFIX}/include/${globalprefix}/${lbprefix} - install -m 644 ${top_srcdir}/LICENSE ${PREFIX}/share/doc/${package}-${version} - ( cd ${top_srcdir}/project && install -m 644 ChangeLog package.description package.summary ${PREFIX}/share/doc/${package}-${version} ) - -test -f LB.html && install -m 644 LB.html ${PREFIX}/share/doc/${package}-${version} + -mkdir -p ${DESTDIR}${PREFIX}${prefix}/${STAGETO} + -mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}/examples + -mkdir -p ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbprefix} + install -m 644 ${top_srcdir}/LICENSE ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} + ( cd ${top_srcdir}/project && install -m 644 ChangeLog package.description package.summary ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} ) + -test -f LB.html && install -m 644 LB.html ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} # install the generated stuff instead -# cd ${top_srcdir}/interface && install -m 644 ${WSDL} ${PREFIX}/${STAGETO} - install -m 644 ${WSDL} ${PREFIX}/${STAGETO} - install -m 644 glue2-copy.xsd ${PREFIX}/${STAGETO}/glue2.xsd - install -m 644 ${top_srcdir}/src/lb4agu.wsdl ${PREFIX}/${STAGETO} - install -m 644 ws_interface_version.h ${PREFIX}/include/${globalprefix}/${lbprefix} +# cd ${top_srcdir}/interface && install -m 644 ${WSDL} ${DESTDIR}${PREFIX}${prefix}/${STAGETO} + install -m 644 ${WSDL} ${DESTDIR}${PREFIX}${prefix}/${STAGETO} + install -m 644 glue2-copy.xsd ${DESTDIR}${PREFIX}${prefix}/${STAGETO}/glue2.xsd + install -m 644 ${top_srcdir}/src/lb4agu.wsdl ${DESTDIR}${PREFIX}${prefix}/${STAGETO} + install -m 644 ws_interface_version.h ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbprefix} # JP has its own version anyway # if [ x${DOSTAGE} = xyes ]; then \ -# mkdir -p ${PREFIX}/share/lb; \ -# install -m 644 ${top_srcdir}/src/puke-wsdl.xsl ${top_srcdir}/src/puke-ug.xsl ${PREFIX}/share/lb; \ +# mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/glite-lb; \ +# install -m 644 ${top_srcdir}/src/puke-wsdl.xsl ${top_srcdir}/src/puke-ug.xsl ${DESTDIR}${PREFIX}${prefix}/share/glite-lb; \ # fi clean: diff --git a/org.glite.lb.ws-test/Makefile b/org.glite.lb.ws-test/Makefile index 42ed623..6426284 100644 --- a/org.glite.lb.ws-test/Makefile +++ b/org.glite.lb.ws-test/Makefile @@ -2,6 +2,7 @@ top_srcdir=.. stagedir=. version=0.0.0 PREFIX=/opt/glite +prefix= glite_location=/opt/glite globus_prefix=/opt/globus @@ -33,20 +34,20 @@ VPATH=${top_srcdir}/examples CC=gcc DEBUG:=-g -O0 -Wall CFLAGS:=${CFLAGS} -I${gsoap_prefix}/include -I${gsoap_prefix}/ \ - -I${stagedir}/include -I${top_srcdir}/src -I. \ + -I${stagedir}${prefix}/include -I${top_srcdir}/src -I. \ ${GLOBUS_GSSAPI_GSI_CFLAGS} \ ${DEBUG} COMPILE:=libtool --mode=compile ${CC} ${CFLAGS} -LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/${libdir} ${LDFLAGS} +LINK:=libtool --mode=link ${CC} -rpath ${stagedir}${prefix}/${libdir} ${LDFLAGS} INSTALL:=libtool --mode=install install GSOAP_FILES_PREFIX:= bk_ws_ dotless_gsoap_ver:=${shell echo ${gsoap_default_version} | tr -d . } -ifeq ($(shell test -f ${stagedir}/${libdir}/libglite_security_gsoap_plugin_${dotless_gsoap_ver}${default_flavour}_c.so && echo ok),ok) +ifeq ($(shell test -f ${stagedir}${prefix}/${libdir}/libglite_security_gsoap_plugin_${dotless_gsoap_ver}${default_flavour}_c.so && echo ok),ok) langflavour:=_c endif -GSOAP_LIB:=-L${stagedir}/${libdir} -lglite_security_gsoap_plugin_${dotless_gsoap_ver}${default_flavour}${langflavour} +GSOAP_LIB:=-L${stagedir}${prefix}/${libdir} -lglite_security_gsoap_plugin_${dotless_gsoap_ver}${default_flavour}${langflavour} WS_CLIENT_OBJS:= $(GSOAP_FILES_PREFIX)C.o $(GSOAP_FILES_PREFIX)Client.o ws_fault.o # ws_typeref.o @@ -69,17 +70,17 @@ check: @echo "No test" install: - mkdir -p ${PREFIX}/examples/ + mkdir -p ${DESTDIR}${PREFIX}${prefix}/examples/ for f in ${CEXAMPLES}; do \ - ${INSTALL} -m 755 $$f ${PREFIX}/examples/glite-lb-$$f; \ + ${INSTALL} -m 755 $$f ${DESTDIR}${PREFIX}${prefix}/examples/glite-lb-$$f; \ done clean: rm -rvf .libs LB.xh *.xml ${GSOAP_FILES_PREFIX}* *.o *.lo *.nsmap soap_version.h ${CEXAMPLES} rm -rvf log.xml project/ rpmbuild/ RPMS/ tgz/ debian/ -LB.xh: ws_typemap.dat ${stagedir}/interface/LB.wsdl - ${gsoap_bin_prefix}/wsdl2h -c -t ${top_srcdir}/examples/ws_typemap.dat -I${stagedir}/interface -o $@ ${stagedir}/interface/LB.wsdl +LB.xh: ws_typemap.dat ${stagedir}${prefix}/interface/LB.wsdl + ${gsoap_bin_prefix}/wsdl2h -c -t ${top_srcdir}/examples/ws_typemap.dat -I${stagedir}${prefix}/interface -o $@ ${stagedir}${prefix}/interface/LB.wsdl soap_version.h: ${gsoap_bin_prefix}/soapcpp2 /dev/null diff --git a/org.glite.lb.yaim/Makefile b/org.glite.lb.yaim/Makefile index d1b1ef0..8c83c2b 100644 --- a/org.glite.lb.yaim/Makefile +++ b/org.glite.lb.yaim/Makefile @@ -3,6 +3,7 @@ stagedir=. package=glite-lb-yaim version=0.0.0 PREFIX=/opt/glite +prefix= -include Makefile.inc -include ../project/version.properties @@ -10,22 +11,22 @@ PREFIX=/opt/glite all: install: - mkdir -p $(PREFIX)/yaim/functions/ - mkdir -p $(PREFIX)/yaim/node-info.d - mkdir -p $(PREFIX)/yaim/defaults - mkdir -p $(PREFIX)/yaim/etc/versions - install -m 0644 $(top_srcdir)/config/defaults/glite-lb.pre $(PREFIX)/yaim/defaults + mkdir -p ${DESTDIR}${PREFIX}${prefix}/yaim/functions/ + mkdir -p ${DESTDIR}${PREFIX}${prefix}/yaim/node-info.d + mkdir -p ${DESTDIR}${PREFIX}${prefix}/yaim/defaults + mkdir -p ${DESTDIR}${PREFIX}${prefix}/yaim/etc/versions + install -m 0644 $(top_srcdir)/config/defaults/glite-lb.pre ${DESTDIR}${PREFIX}${prefix}/yaim/defaults for c in gip_lb glite_lb info_service_lb ; do \ - install -m 0644 $(top_srcdir)/config/functions/config_$$c $(PREFIX)/yaim/functions; \ + install -m 0644 $(top_srcdir)/config/functions/config_$$c ${DESTDIR}${PREFIX}${prefix}/yaim/functions; \ done - # dirthy hack for EPEL - flavour-less globus not initialized by gpt + # dirty hack for EPEL - flavour-less globus not initialized by gpt if test "x$(thrflavour)" = "x"; then \ grep -v config_globus_clients $(top_srcdir)/config/node-info.d/glite-lb > glite-lb; \ - install -m 0644 glite-lb $(PREFIX)/yaim/node-info.d; \ + install -m 0644 glite-lb ${DESTDIR}${PREFIX}${prefix}/yaim/node-info.d; \ else \ - install -m 0644 $(top_srcdir)/config/node-info.d/glite-lb $(PREFIX)/yaim/node-info.d; \ + install -m 0644 $(top_srcdir)/config/node-info.d/glite-lb ${DESTDIR}${PREFIX}${prefix}/yaim/node-info.d; \ fi - echo "$(package) $(module.version)-$(module.age)" > $(PREFIX)/yaim/etc/versions/$(package) + echo "$(package) $(module.version)-$(module.age)" > ${DESTDIR}${PREFIX}${prefix}/yaim/etc/versions/$(package) stage: $(MAKE) install PREFIX=${stagedir} diff --git a/org.glite.lb/configure b/org.glite.lb/configure index 5c056c4..a221588 100755 --- a/org.glite.lb/configure +++ b/org.glite.lb/configure @@ -28,6 +28,9 @@ use Getopt::Long; my $pwd = `pwd`; chomp $pwd; my $prefix = $pwd.'/stage'; my $stagedir; +my $root = ''; +my $sysroot = ''; +my $sysconfdir; my $staged; my $module; my $thrflavour = 'gcc64dbgpthr'; @@ -187,6 +190,9 @@ my @opts = ( 'branch=s' => \$branch, 'output=s' => \$output, 'stage=s' => \$stagedir, + 'root:s' => \$root, + 'sysroot:s' => \$sysroot, + 'sysconfdir:s' => \$sysconfdir, 'lb-tag=s' => \$lb_tag, 'lbjp-common-tag=s' => \$lbjp_tag, 'jp-tag=s' => \$jp_tag, @@ -210,6 +216,12 @@ push @opts,"with-$_=s",\$jar{$_} for keys %jar; my @keeparg = @ARGV; GetOptions @opts or die "Errors parsing command line\n"; +$prefix=~s/\/$//; +$stage=~s/\/$//; +$root=~s/\/$//; +$sysroot=~s/\/$//; +if (not $sysconfdir) { $sysconfdir = "$prefix/etc"; } +$sysconfdir=~s/\/$//; $externs{'mysql-devel'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-devel'}{prefix} eq ''; $externs{'mysql-server'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-server'}{prefix} eq ''; @@ -684,9 +696,11 @@ px.proxyrenewal px.myproxy-yaim px.glite-PX px.myproxy-config print "Creating $full/$buildroot{$_}/Makefile.inc\n"; - print MKINC qq{ -PREFIX = $prefix + print MKINC qq{PREFIX = $root +prefix = $prefix stagedir = $stagedir +sysroot = $sysroot +sysconfdir = $sysconfdir thrflavour = $thrflavour nothrflavour = $nothrflavour libdir = $libdir @@ -877,7 +891,7 @@ sub mode_etics { my $flags; if ($emi) { - $flags = 'RELEASE_VERSION=${age}.${platformFamily} prefix=${prefix} libdir=${libdir} GSOAPDIR=`pkg-config gsoap --variable=prefix` OPENSSL_GLOBUS_FLAGS=`pkg-config globus-openssl --cflags` OPENSSL_GLOBUS_LIBS=`pkg-config globus-openssl --libs` FLAVOR_GLOBUS_EXT= HTTPD_FLAGS="-I/usr/include/httpd -I/usr/include/apache2 -I/usr/include/apr-${aprSuffix} -I/usr/include/pcre"'; + $flags = 'RELEASE_VERSION=${age}.${platformFamily} prefix=${prefix}/usr libdir=${libdir} GSOAPDIR=`pkg-config gsoap --variable=prefix` OPENSSL_GLOBUS_FLAGS=`pkg-config globus-openssl --cflags` OPENSSL_GLOBUS_LIBS=`pkg-config globus-openssl --libs` FLAVOR_GLOBUS_EXT= HTTPD_FLAGS="-I/usr/include/httpd -I/usr/include/apache2 -I/usr/include/apr-${aprSuffix} -I/usr/include/pcre"'; } else { $flags = 'RELEASE_VERSION=${age}.${platformFamily} prefix=${prefix} libdir=${libdir} GSOAPDIR=${gsoap.location} OPENSSL_GLOBUS_FLAGS=-I${globus.location}/include/${globus.dbg.nothr.flavor} OPENSSL_GLOBUS_LIBS=-L${globus.location}/${libdir}/ FLAVOR_GLOBUS_EXT=_${globus.dbg.nothr.flavor} HTTPD_FLAGS="-I${httpd-devel.location}/include/httpd -I${httpd-devel.location}/include/apache2 -I${httpd-devel.location}/include/apr-${aprSuffix} -I${httpd-devel.location}/include/pcre"'; } @@ -896,7 +910,11 @@ sub mode_etics { } else { my $flavours = $emi ? "--thrflavour= --nothrflavour=" : "--thrflavour=\${globus.thr.flavor} --nothrflavour=\${globus.nothr.flavor}"; - $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure $flavours --prefix=\${prefix} --stage=\${stageDir} --libdir=\${libdir} --module $subsys.$module @copts"; + my $localprefix = $emi ? '/usr' : ''; + my $sysconfdir = ' --sysconfdir=/etc'; + # exception for yaims in EMI for now: prefix /opt/glite + if ($emi and $module eq 'yaim') { $localprefix = '/opt/glite'; $sysconfdir = ''; } + $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure $flavours --root=\${prefix} --prefix=${localprefix} --stage=\${stageDir} --sysroot=\${package.prefix}$sysconfdir --libdir=\${libdir} --module $subsys.$module @copts"; $cmd{compile} = 'make'; $cmd{test} = 'make check'; $cmd{install} = 'make install'; @@ -909,7 +927,7 @@ sub mode_etics { } my $checkoutcmd = "cvs -d \${vcsroot} co -d \${moduleName} ".($conftag eq 'HEAD' ? '-A' : '-r ${tag}')." $cvs_prefix{$subsys}.$subsys.$module"; - $checkoutcmd .= "; ln -s \${moduleName} $cvs_prefix{$subsys}.$subsys.$module 2>/dev/null || true" if ($emi); + $checkoutcmd .= "; test -e $cvs_prefix{$subsys}.$subsys.$module || ln -s \${moduleName} $cvs_prefix{$subsys}.$subsys.$module 2>/dev/null" if ($emi); print STDERR "Writing $file\n"; print C qq{ @@ -1077,6 +1095,10 @@ usage: $0 options General options (defaults in []): --prefix=PREFIX destination directory [./stage] + --stage=DIR staging directory [./stage] + --root=DIR installation root (custom relocation root -> sysroot) [] + --sysroot=DIR system root (custom relocation root -> sysroot) [] + --sysconfdir=DIR system configuration directory [PREFIX/etc] --staged=module,module,... what is already in PREFIX (specify without org.glite.) --thrflavour=flavour --nothrflavour=flavour threaded and non-treaded flavours [gcc64dbgpthr,gcc64dbg] @@ -1087,7 +1109,7 @@ General options (defaults in []): --emi generate configurations with emi flavor in mode 'etics' Mode of operation: - --mode={checkout|build|etics} what to do [build] + --mode=\{checkout|build|etics\} what to do [build] What to build: --module=module build this module only (mostly in-Etics operation) diff --git a/org.glite.lb/etics-tag-with-subsystems-branch.pl b/org.glite.lb/etics-tag-with-subsystems-branch.pl index 7512a01..0345bb4 100644 --- a/org.glite.lb/etics-tag-with-subsystems-branch.pl +++ b/org.glite.lb/etics-tag-with-subsystems-branch.pl @@ -136,8 +136,6 @@ usage: $0 -b [-c configuration] subsystem.name printf (NEWCONF "[Configuration-$newconfig]\nprofile = None\nmoduleName = $module\ndisplayName = $newconfig\ndescription = None\nprojectName = org.glite\nage = $current_age\ntag = $branch\nversion = $current_major.$current_minor.$current_revision\npath = None\n\n"); - if ( $project eq "emi" ) { printf (NEWCONF "[Platform-default:Property]\npackage.prefix = /opt/emi\n\n"); } - # printf (NEWCONF "[Platform-default:VcsCommand]\ndisplayName = None\ndescription = HEAD CVS commands\ntag = cvs -d \${vcsroot} tag -R \${tag} \${moduleName}\nbranch = None\ncommit = None\ncheckout = cvs -d \${vcsroot} co -r \${tag} \${moduleName}\n\n"); # printf (NEWCONF "[Platform-default:Environment]\nHOME = \${workspaceDir}"); diff --git a/org.glite.lbjp-common.db/Makefile b/org.glite.lbjp-common.db/Makefile index cb2374b..1a4cdeb 100644 --- a/org.glite.lbjp-common.db/Makefile +++ b/org.glite.lbjp-common.db/Makefile @@ -7,6 +7,7 @@ globalprefix=glite lbutilsprefix=lbu package=glite-lb-utils-db PREFIX=/opt/glite +prefix= mysql-devel_prefix=/opt/mysql postgresql_prefix=/usr @@ -41,7 +42,7 @@ PSQL_CPPFLAGS:=-I${postgresql_prefix}/include -I${postgresql_prefix}/include/pos CFLAGS:= ${CFLAGS} \ ${DEBUG} \ -DVERSION=\"${version}\" \ - -I${stagedir}/include -I${top_srcdir}/src -I. \ + -I${stagedir}${prefix}/include -I${top_srcdir}/src -I. \ -I${top_srcdir}/interface \ ${COVERAGE_FLAGS} \ -D_GNU_SOURCE \ @@ -62,12 +63,12 @@ endif TEST_LIBS:=-L${cppunit_prefix}/${libdir} -lcppunit TEST_INC:=-I${cppunit_prefix}/include -LDFLAGS:=${LDFLAGS} -L${stagedir}/${libdir} ${COVERAGE_FLAGS} +LDFLAGS:=${LDFLAGS} -L${stagedir}${prefix}/${libdir} ${COVERAGE_FLAGS} COMPILE:=libtool --mode=compile ${CC} ${CFLAGS} COMPILEXX:=libtool --mode=compile ${CXX} ${CFLAGS} -LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/${libdir} ${LDFLAGS} -LINKXX:=libtool --mode=link ${CXX} -rpath ${stagedir}/${libdir} ${LDFLAGS} +LINK:=libtool --mode=link ${CC} -rpath ${stagedir}${prefix}/${libdir} ${LDFLAGS} +LINKXX:=libtool --mode=link ${CXX} -rpath ${stagedir}${prefix}/${libdir} ${LDFLAGS} INSTALL:=libtool --mode=install install EXT_LIBS:=-lglite_lbu_trio -lglite_lbu_log -lpthread ${DL_LIBS} @@ -161,17 +162,17 @@ distsrc: distbin: $(MAKE) install PREFIX=`pwd`/tmpbuilddir${stagedir} - save_dir=`pwd`; cd tmpbuilddir${stagedir} && tar -czf $$save_dir/${top_srcdir}/${distdir}/${package}-${version}_bin.tar.gz *; cd $$save_dir + save_dir=`pwd`; cd tmpbuilddir${stagedir}${prefix} && tar -czf $$save_dir/${top_srcdir}/${distdir}/${package}-${version}_bin.tar.gz *; cd $$save_dir rm -rf tmpbuilddir install: all - -mkdir -p ${PREFIX}/${libdir} - -mkdir -p ${PREFIX}/share/doc/${package}-${version} - -mkdir -p ${PREFIX}/include/${globalprefix}/${lbutilsprefix} - ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${PREFIX}/share/doc/${package}-${version} - -cp -r C ${PREFIX}/share/doc/${package}-${version} - ${INSTALL} -m 755 "libglite_lbu_db.la" "${PREFIX}/${libdir}/libglite_lbu_db.la"; \ - ${INSTALL} -m 644 ${top_srcdir}/interface/${HDRS} ${PREFIX}/include/${globalprefix}/${lbutilsprefix} + -mkdir -p ${DESTDIR}${PREFIX}${prefix}/${libdir} + -mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} + -mkdir -p ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbutilsprefix} + ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} + -cp -r C ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} + ${INSTALL} -m 755 "libglite_lbu_db.la" "${DESTDIR}${PREFIX}${prefix}/${libdir}/libglite_lbu_db.la"; \ + ${INSTALL} -m 644 ${top_srcdir}/interface/${HDRS} ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbutilsprefix} clean: rm -rvf *.o *.lo *.loT .libs lib* *.c *.h *.dox C/ CPP/ diff --git a/org.glite.lbjp-common.gsoap-plugin/Makefile b/org.glite.lbjp-common.gsoap-plugin/Makefile index 7178a3b..79ab476 100644 --- a/org.glite.lbjp-common.gsoap-plugin/Makefile +++ b/org.glite.lbjp-common.gsoap-plugin/Makefile @@ -7,6 +7,7 @@ globalprefix=glite package=gsoap-plugin version=1.0.0 PREFIX=/opt/glite +prefix= glite_location=/opt/glite gsoap_prefix=/opt/gsoap @@ -76,17 +77,17 @@ CFLAGS:= ${CFLAGS} ${DEBUG} \ -DVERSION=\"${version}\" \ -DWITH_NONAMESPACES \ -I. -I${top_srcdir}/interface \ - -I${stagedir}/include \ + -I${stagedir}${prefix}/include \ ${COVERAGE_FLAGS} -D_GNU_SOURCE -DDATAGRID_EXTENSION -DWITH_IPV6 LDFLAGS:=${LDFLAGS} ${COVERAGE_FLAGS} COMPILE:=libtool --mode=compile ${CC} ${CFLAGS} COMPILEXX:=libtool --mode=compile ${CXX} ${CFLAGS} -LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/${libdir} ${LDFLAGS} -LINKXX:=libtool --mode=link ${CXX} -rpath ${stagedir}/${libdir} ${LDFLAGS} +LINK:=libtool --mode=link ${CC} -rpath ${stagedir}${prefix}/${libdir} ${LDFLAGS} +LINKXX:=libtool --mode=link ${CXX} -rpath ${stagedir}${prefix}/${libdir} ${LDFLAGS} INSTALL:=libtool --mode=install install -LINK_lang:=PATH=${top_srcdir}/project/libtoolhack:${PATH} libtool --mode=link ${CXX} -rpath ${stagedir}/${libdir} ${LDFLAGS} +LINK_lang:=PATH=${top_srcdir}/project/libtoolhack:${PATH} libtool --mode=link ${CXX} -rpath ${stagedir}${prefix}/${libdir} ${LDFLAGS} ifeq (${lang},c) LINK_lang:=${LINK} endif @@ -97,9 +98,9 @@ endif gsoaplibdir=$(shell if test -d "${gsoap_prefix}/${libdir}"; then echo "${gsoap_prefix}/${libdir}"; else echo "${gsoap_prefix}/lib"; fi) GSOAP_LIBS?=-L${gsoaplibdir} -lgsoap -EX_NOTHRLIBS:=-L${stagedir}/${libdir} -lglite_security_gss_${nothrflavour} -EX_THRLIBS:=-L${stagedir}/${libdir} -lglite_security_gss_${thrflavour} -EX_LIBS:=-L${stagedir}/${libdir} -lglite_security_gss +EX_NOTHRLIBS:=-L${stagedir}${prefix}/${libdir} -lglite_security_gss_${nothrflavour} +EX_THRLIBS:=-L${stagedir}${prefix}/${libdir} -lglite_security_gss_${thrflavour} +EX_LIBS:=-L${stagedir}${prefix}/${libdir} -lglite_security_gss HDRS:=glite_gsplugin.h glite_gscompat.h glite_gsplugin-int.h EXAMPLES:=wscalc_clt_ex wscalc_srv_ex wscalc_srv_ex2 TESTS:=test_cxx @@ -281,12 +282,12 @@ stage: $(MAKE) install PREFIX=${stagedir} DOSTAGE=yes install: - -mkdir -p ${PREFIX}/${libdir} - -mkdir -p ${PREFIX}/include/glite/security - -mkdir -p ${PREFIX}/share/doc/${package}-${version} - -mkdir -p ${PREFIX}/include/glite/security/ - ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${PREFIX}/share/doc/${package}-${version} - cd ${top_srcdir}/interface && ${INSTALL} -m 644 ${HDRS} ${PREFIX}/include/glite/security/ + -mkdir -p ${DESTDIR}${PREFIX}${prefix}/${libdir} + -mkdir -p ${DESTDIR}${PREFIX}${prefix}/include/glite/security + -mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} + -mkdir -p ${DESTDIR}${PREFIX}${prefix}/include/glite/security/ + ${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/glite/security/ for v in ${gsoap_versions_noflavours}; do \ ${MAKE} -C `echo $$v | tr -d .` -f ../Makefile install-soaplib gsoap_version=$$v lang= PREFIX=${PREFIX} top_srcdir=${top_srcdir}/.. || exit $?; \ done @@ -296,7 +297,7 @@ install: done install-soaplib: - ${INSTALL} -m 755 ${lib_LTLIBRARIES_S} ${PREFIX}/${libdir} + ${INSTALL} -m 755 ${lib_LTLIBRARIES_S} ${DESTDIR}${PREFIX}${prefix}/${libdir} clean: rm -rvf ${lib_LTLIBRARIES} diff --git a/org.glite.lbjp-common.gss/Makefile b/org.glite.lbjp-common.gss/Makefile index dee08e4..075f796 100644 --- a/org.glite.lbjp-common.gss/Makefile +++ b/org.glite.lbjp-common.gss/Makefile @@ -7,6 +7,7 @@ globalprefix=glite package=gss version=1.0.0 PREFIX=/opt/glite +prefix= glite_location=/opt/glite globus_prefix=/opt/globus @@ -43,14 +44,14 @@ DEBUG:=-g -O0 -W -Wall -Wno-unused-parameter CFLAGS:= ${CFLAGS} ${DEBUG} \ -DVERSION=\"${version}\" \ -I. -I${top_srcdir}/interface \ - -I${stagedir}/include \ + -I${stagedir}${prefix}/include \ ${COVERAGE_FLAGS} -D_GNU_SOURCE -DDATAGRID_EXTENSION LDFLAGS:=${LDFLAGS} ${COVERAGE_FLAGS} COMPILE:=libtool --mode=compile ${CC} ${CFLAGS} -LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/${libdir} ${LDFLAGS} -LINKXX:=libtool --mode=link ${CXX} -rpath ${stagedir}/${libdir} ${LDFLAGS} +LINK:=libtool --mode=link ${CC} -rpath ${stagedir}${prefix}/${libdir} ${LDFLAGS} +LINKXX:=libtool --mode=link ${CXX} -rpath ${stagedir}${prefix}/${libdir} ${LDFLAGS} INSTALL:=libtool --mode=install install CPPUNIT_LIBS?=-L${cppunit_prefix}/${libdir} -lcppunit @@ -145,14 +146,14 @@ stage: $(MAKE) install PREFIX=${stagedir} DOSTAGE=yes install: - -mkdir -p ${PREFIX}/${libdir} - -mkdir -p ${PREFIX}/share/doc/${package}-${version} - -mkdir -p ${PREFIX}/include/glite/security - ${INSTALL} -m 755 ${lib_LTLIBRARIES} ${PREFIX}/${libdir} - ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${PREFIX}/share/doc/${package}-${version} - cd ${top_srcdir}/interface && ${INSTALL} -m 644 ${HDRS} ${PREFIX}/include/glite/security/ + -mkdir -p ${DESTDIR}${PREFIX}${prefix}/${libdir} + -mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} + -mkdir -p ${DESTDIR}${PREFIX}${prefix}/include/glite/security + ${INSTALL} -m 755 ${lib_LTLIBRARIES} ${DESTDIR}${PREFIX}${prefix}/${libdir} + ${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/glite/security/ if [ x${DOSTAGE} = xyes ]; then \ - install -m 644 ${lib_LIBRARIES} ${PREFIX}/${libdir}; \ + install -m 644 ${lib_LIBRARIES} ${DESTDIR}${PREFIX}${prefix}/${libdir}; \ fi clean: diff --git a/org.glite.lbjp-common.jp-interface/Makefile b/org.glite.lbjp-common.jp-interface/Makefile index 4730cb0..cf54694 100644 --- a/org.glite.lbjp-common.jp-interface/Makefile +++ b/org.glite.lbjp-common.jp-interface/Makefile @@ -8,6 +8,7 @@ jpprefix=jp package=glite-lbjp-common-jp-interface version=0.0.0 PREFIX=/opt/glite +prefix= globus_prefix=/opt/globus expat_prefix=/opt/expat @@ -23,7 +24,7 @@ version=${module.version} VPATH=${top_srcdir}/src:${top_srcdir}/test:${top_srcdir}/project:${jpproject} DEBUG:=-g -O0 -W -Wno-sign-compare -CFLAGS:=${CFLAGS} ${DEBUG} -D_GNU_SOURCE -I. -I${top_srcdir}/interface -I${stagedir}/include +CFLAGS:=${CFLAGS} ${DEBUG} -D_GNU_SOURCE -I. -I${top_srcdir}/interface -I${stagedir}${prefix}/include # In order to use libtool versioning correcty, we must have: # @@ -41,7 +42,7 @@ version_info:=-version-info ${shell \ perl -e '$$,=":"; @F=split "\\.","${version}"; print $$F[0]+$$F[1]+${offset},$$F[2],$$F[1]' } -LINK:=libtool --mode=link ${CC} ${LDFLAGS} -rpath ${stagedir}/${libdir} ${version_info} +LINK:=libtool --mode=link ${CC} ${LDFLAGS} -rpath ${stagedir}${prefix}/${libdir} ${version_info} LINKXX:=libtool --mode=link ${CXX} ${LDFLAGS} INSTALL:=libtool --mode=install install COMPILE:=libtool --mode=compile ${CC} ${CFLAGS} @@ -51,7 +52,7 @@ HDRS:=types.h context.h attr.h known_attr.h backend.h builtin_plugins.h file_plu SRCS:=context.c attr.c utils.c indexdb.c OBJS:=${SRCS:.c=.lo} THROBJS:=${OBJS:.o=.thr.lo} -LIBS:=-L${stagedir}/${libdir} -lglite_jobid -lglite_lbu_db +LIBS:=-L${stagedir}${prefix}/${libdir} -lglite_jobid -lglite_lbu_db THRLIBS:=${LIBS} CPPUNIT_LIBS?=-L${cppunit_prefix}/${libdir} -lcppunit -ldl @@ -94,10 +95,10 @@ stage: compile $(MAKE) install PREFIX=${stagedir} install: - -mkdir -p ${PREFIX}/include/${globalprefix}/${jpprefix} - cd ${top_srcdir}/interface && install -m 644 ${HDRS} ${PREFIX}/include/${globalprefix}/${jpprefix} - -mkdir -p ${PREFIX}/${libdir} - ${INSTALL} -m 755 ${lib_LTLIBRARIES} ${PREFIX}/${libdir} + -mkdir -p ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${jpprefix} + cd ${top_srcdir}/interface && install -m 644 ${HDRS} ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${jpprefix} + -mkdir -p ${DESTDIR}${PREFIX}${prefix}/${libdir} + ${INSTALL} -m 755 ${lib_LTLIBRARIES} ${DESTDIR}${PREFIX}${prefix}/${libdir} clean: rm -rvf *.o *.lo .libs lib* diff --git a/org.glite.lbjp-common.log/Makefile b/org.glite.lbjp-common.log/Makefile index 26b420d..905d1b6 100644 --- a/org.glite.lbjp-common.log/Makefile +++ b/org.glite.lbjp-common.log/Makefile @@ -8,6 +8,8 @@ lbutilsprefix=lbu package=glite-lbu-log version=0.0.0 PREFIX=/opt/glite +prefix= +sysconfdir=/etc log4c_prefix=/usr -include Makefile.inc @@ -25,14 +27,14 @@ DEBUG:=-g -O0 -W -Wall CFLAGS:= ${CFLAGS} \ ${DEBUG} \ - -I${stagedir}/include -I${top_srcdir}/src \ + -I${stagedir}${prefix}/include -I${top_srcdir}/src \ -I${top_srcdir}/interface \ ${LOG4C_CFLAGS} -LDFLAGS:=${LDFLAGS} -L${stagedir}/${libdir} +LDFLAGS:=${LDFLAGS} -L${stagedir}${prefix}/${libdir} COMPILE:=libtool --mode=compile ${CC} ${CFLAGS} -LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/${libdir} ${LDFLAGS} +LINK:=libtool --mode=link ${CC} -rpath ${stagedir}${prefix}/${libdir} ${LDFLAGS} INSTALL:=libtool --mode=install install OBJS:=log.o @@ -62,21 +64,22 @@ stage: compile $(MAKE) install PREFIX=${stagedir} install: compile - mkdir -p ${PREFIX}/include/${globalprefix}/${lbutilsprefix} - ${INSTALL} -m 644 ${top_srcdir}/src/log.h ${PREFIX}/include/${globalprefix}/${lbutilsprefix} - mkdir -p ${PREFIX}/share/doc/${package}-${version} - ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${PREFIX}/share/doc/${package}-${version} - ${INSTALL} -m 644 ${top_srcdir}/README ${PREFIX}/share/doc/${package}-${version} - mkdir -p ${PREFIX}/etc/glite-lb - ${INSTALL} -m 644 ${top_srcdir}/config/log4crc ${PREFIX}/etc/glite-lb/log4crc - ${INSTALL} -m 644 ${top_srcdir}/config/log4crc ${PREFIX}/share/doc/${package}-${version}/log4crc.example-production - ${INSTALL} -m 644 ${top_srcdir}/config/log4crc.debugging ${PREFIX}/share/doc/${package}-${version}/log4crc.example-debugging - mkdir -p ${PREFIX}/${libdir} - ${INSTALL} -m 755 ${LTLIB} ${PREFIX}/${libdir}/${LTLIB} + mkdir -p ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbutilsprefix} + ${INSTALL} -m 644 ${top_srcdir}/src/log.h ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbutilsprefix} + mkdir -p ${DESTDIE}${PREFIX}${prefix}/share/doc/${package}-${version} + ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} + ${INSTALL} -m 644 ${top_srcdir}/README ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} + mkdir -p ${DESTDIR}${PREFIX}${sysconfdir}/glite-lb + ${INSTALL} -m 644 ${top_srcdir}/config/log4crc ${DESTDIR}${PREFIX}${sysconfdir}/glite-lb/log4crc + ${INSTALL} -m 644 ${top_srcdir}/config/log4crc ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}/log4crc.example-production + ${INSTALL} -m 644 ${top_srcdir}/config/log4crc.debugging ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}/log4crc.example-debugging + mkdir -p ${DESTDIR}${PREFIX}${prefix}/${libdir} + ${INSTALL} -m 755 ${LTLIB} ${DESTDIR}${PREFIX}${prefix}/${libdir}/${LTLIB} clean: rm -rvf *.o *.lo .libs lib* rm -rvf log.xml project/ rpmbuild/ RPMS/ tgz/ debian/ + rm -rvf test check: test LOG4C_RCPATH=${top_srcdir}/tests ./test diff --git a/org.glite.lbjp-common.maildir/Makefile b/org.glite.lbjp-common.maildir/Makefile index c8f9ece..fed15db 100644 --- a/org.glite.lbjp-common.maildir/Makefile +++ b/org.glite.lbjp-common.maildir/Makefile @@ -8,7 +8,7 @@ lbutilsprefix=lbu package=glite-lb-utils-maildir version=1.0.0 PREFIX=/opt/glite -flavour=gcc32thr +prefix= glite_location=/opt/glite cppunit_prefix=/opt/cppunit @@ -29,15 +29,15 @@ DEBUG:=-g -O0 -W -Wall CFLAGS:= ${CFLAGS} \ ${DEBUG} \ -DVERSION=\"${version}\" \ - -I${stagedir}/include -I${top_srcdir}/src -I. \ + -I${stagedir}${prefix}/include -I${top_srcdir}/src -I. \ -I${top_srcdir}/interface \ ${COVERAGE_FLAGS} \ -D_GNU_SOURCE -LDFLAGS:=${LDFLAGS} -L${stagedir}/${libdir} ${COVERAGE_FLAGS} +LDFLAGS:=${LDFLAGS} -L${stagedir}${prefix}/${libdir} ${COVERAGE_FLAGS} COMPILE:=libtool --mode=compile ${CC} ${CFLAGS} -LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/${libdir} ${LDFLAGS} +LINK:=libtool --mode=link ${CC} -rpath ${stagedir}${prefix}/${libdir} ${LDFLAGS} INSTALL:=libtool --mode=install install EXT_LIBS:= @@ -86,11 +86,11 @@ stage: compile $(MAKE) install PREFIX=${stagedir} DOSTAGE=yes install: all - -mkdir -p ${PREFIX}/${libdir} - -mkdir -p ${PREFIX}/share/doc/${package}-${version} - -mkdir -p ${PREFIX}/include/${globalprefix}/${lbutilsprefix} - ${INSTALL} -m 755 "libglite_lbu_maildir.la" "${PREFIX}/${libdir}/libglite_lbu_maildir.la"; \ - ${INSTALL} -m 644 ${top_srcdir}/interface/${HDRS} ${PREFIX}/include/${globalprefix}/${lbutilsprefix} + -mkdir -p ${DESTDIR}${PREFIX}${prefix}/${libdir} + -mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} + -mkdir -p ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbutilsprefix} + ${INSTALL} -m 755 "libglite_lbu_maildir.la" "${DESTDIR}${PREFIX}${prefix}/${libdir}/libglite_lbu_maildir.la"; \ + ${INSTALL} -m 644 ${top_srcdir}/interface/${HDRS} ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbutilsprefix} clean: rm -rvf *.o *.lo .libs lib* *.c *.h *.dox C/ CPP/ diff --git a/org.glite.lbjp-common.server-bones/Makefile b/org.glite.lbjp-common.server-bones/Makefile index 9d8dce5..f748493 100644 --- a/org.glite.lbjp-common.server-bones/Makefile +++ b/org.glite.lbjp-common.server-bones/Makefile @@ -6,6 +6,7 @@ lbutilsprefix=lbu package=glite-lb-server-bones version=0.0.1 PREFIX=/opt/glite +prefix= CC=gcc @@ -19,9 +20,9 @@ VPATH=${top_srcdir}/src:${top_srcdir}/examples DEBUG:=-g -O0 -Wall CFLAGS:= ${CFLAGS} ${DEBUG} \ -I${top_srcdir}/interface \ - -I${stagedir}/include \ + -I${stagedir}${prefix}/include \ -D_GNU_SOURCE -LDFLAGS:=${LDFLAGS} -L${stagedir}/${libdir} +LDFLAGS:=${LDFLAGS} -L${stagedir}${prefix}/${libdir} ifdef LB_PROF CFLAGS:= ${CFLAGS} -pg -g @@ -29,7 +30,7 @@ ifdef LB_PROF endif COMPILE:=libtool --mode=compile ${CC} ${CFLAGS} -LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/${libdir} ${LDFLAGS} +LINK:=libtool --mode=link ${CC} -rpath ${stagedir}${prefix}/${libdir} ${LDFLAGS} INSTALL:=libtool --mode=install install STATICLIB:=libglite_lbu_server_bones.a @@ -83,11 +84,11 @@ cnt_example: cnt_example.o doc: install: - mkdir -p ${PREFIX}/include/${globalprefix}/${lbutilsprefix} - mkdir -p ${PREFIX}/${libdir} - ${INSTALL} -m 644 ${LTLIB} ${PREFIX}/${libdir} - ${INSTALL} -m 644 ${STATICLIB} ${PREFIX}/${libdir} ; \ - cd ${top_srcdir}/interface && install -m 644 ${HDRS} ${PREFIX}/include/${globalprefix}/${lbutilsprefix} + mkdir -p ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbutilsprefix} + mkdir -p ${DESTDIR}${PREFIX}${prefix}/${libdir} + ${INSTALL} -m 644 ${LTLIB} ${DESTDIR}${PREFIX}${prefix}/${libdir} + ${INSTALL} -m 644 ${STATICLIB} ${DESTDIR}${PREFIX}${prefix}/${libdir} ; \ + cd ${top_srcdir}/interface && install -m 644 ${HDRS} ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbutilsprefix} clean: rm -rvf *.o *.lo .libs lib* srv_example cnt_example diff --git a/org.glite.lbjp-common.trio/Makefile b/org.glite.lbjp-common.trio/Makefile index 838de1e..db72b1c 100644 --- a/org.glite.lbjp-common.trio/Makefile +++ b/org.glite.lbjp-common.trio/Makefile @@ -9,6 +9,7 @@ package=glite-lb-utils-trio version=0.0.0 PREFIX=/opt/glite lbuprefix=lbu +prefix= -include Makefile.inc -include ../project/version.properties @@ -24,8 +25,8 @@ DEBUG:=-g -O0 -Wall CFLAGS:=${CFLAGS} ${DEBUG} -I${top_srcdir}/src -I${top_srcdir}/interface -I. -DDATAGRID_EXTENSION COMPILE:=libtool --mode=compile ${CC} -LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/${libdir} ${LDFLAGS} -LINKXX:=libtool --mode=link ${CXX} -rpath ${stagedir}/${libdir} ${LDFLAGS} +LINK:=libtool --mode=link ${CC} -rpath ${stagedir}${prefix}/${libdir} ${LDFLAGS} +LINKXX:=libtool --mode=link ${CXX} -rpath ${stagedir}${prefix}/${libdir} ${LDFLAGS} INSTALL:=libtool --mode=install install REPORTS:=${top_srcdir}/reports @@ -97,13 +98,13 @@ distbin: rm -rf tmpbuilddir install: all - -mkdir -p ${PREFIX}/${libdir} - -mkdir -p ${PREFIX}/share/doc/${package}-${version} - -mkdir -p ${PREFIX}/include/${globalprefix}/${lbutilsprefix} - -mkdir -p ${PREFIX}/include/${globalprefix}/${lbuprefix} - ${INSTALL} -m 644 ${LTLIB} ${STATICLIB} ${PREFIX}/${libdir} - ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${PREFIX}/share/doc/${package}-${version} - (cd ${top_srcdir}/interface && ${INSTALL} -m 644 ${HDRS} ${PREFIX}/include/${globalprefix}/${lbuprefix}) + -mkdir -p ${DESTDIR}${PREFIX}${prefix}/${libdir} + -mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} + -mkdir -p ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbutilsprefix} + -mkdir -p ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbuprefix} + ${INSTALL} -m 644 ${LTLIB} ${STATICLIB} ${DESTDIR}${PREFIX}${prefix}/${libdir} + ${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}/${lbuprefix}) clean: rm -rvf *.o *.lo .libs lib* *.c *.h *.dox C/ CPP/