diff options
| author | joerg <joerg@pkgsrc.org> | 2009-07-07 19:07:35 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2009-07-07 19:07:35 +0000 |
| commit | 2782d582db98b063a3a938f280b3c0113e02c1b9 (patch) | |
| tree | 23fbe46a07f5b0c97a756a381fb9a769777b8600 /www/jakarta-tomcat5 | |
| parent | 312a5d61fba641f21356a6bcd56e37c1813e51ed (diff) | |
| download | pkgsrc-2782d582db98b063a3a938f280b3c0113e02c1b9.tar.gz | |
user-destdir support
Diffstat (limited to 'www/jakarta-tomcat5')
| -rw-r--r-- | www/jakarta-tomcat5/Makefile | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/www/jakarta-tomcat5/Makefile b/www/jakarta-tomcat5/Makefile index 1e0a1e801f3..a6bee24adcb 100644 --- a/www/jakarta-tomcat5/Makefile +++ b/www/jakarta-tomcat5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2008/05/26 02:13:25 joerg Exp $ +# $NetBSD: Makefile,v 1.17 2009/07/07 19:09:09 joerg Exp $ PKGNAME= jakarta-tomcat5-${TOMCAT_VERSION} DISTNAME= jakarta-tomcat-${TOMCAT_VERSION} @@ -11,6 +11,8 @@ MAINTAINER= erh@NetBSD.org HOMEPAGE= http://tomcat.apache.org/ COMMENT= The Apache Project's Java Servlet 2.4 and JSP 2.0 server +PKG_DESTDIR_SUPPORT= user-destdir + TOMCAT_VERSION= 5.0.30 USE_JAVA= run @@ -52,21 +54,22 @@ FILES_SUBST+= JAVA_HOME=${PKG_JAVA_HOME:Q} TOMCAT_LIB=${TOMCAT_LIB:Q} do-build: @${MV} ${WRKSRC}/conf ${WRKDIR} + +INSTALLATION_DIRS= ${EGDIR} ${EGDIR2} ${TOMCAT_LIB} + do-install: - ${INSTALL_DATA_DIR} ${EGDIR2} .for f in ${CFILES} - ${INSTALL_DATA} ${WRKDIR}/conf/${f} ${EGDIR} + ${INSTALL_DATA} ${WRKDIR}/conf/${f} ${DESTDIR}${EGDIR} .endfor .for f in ${CF2FILES} - ${INSTALL_DATA} ${WRKDIR}/conf/${CATALINA_DIR}/${f} ${EGDIR2} + ${INSTALL_DATA} ${WRKDIR}/conf/${CATALINA_DIR}/${f} ${DESTDIR}${EGDIR2} .endfor - ${INSTALL_DATA_DIR} ${TOMCAT_LIB} - @(cd ${WRKSRC} && pax -rw -pm . ${TOMCAT_LIB}; \ - ${FIND} ${TOMCAT_LIB} -type f -print | ${XARGS} ${CHMOD} a+r; \ - ${FIND} ${TOMCAT_LIB} \( -type f -o -perm -u+x \) -print \ + @(cd ${WRKSRC} && pax -rw -pm . ${DESTDIR}${TOMCAT_LIB}; \ + ${FIND} ${DESTDIR}${TOMCAT_LIB} -type f -print | ${XARGS} ${CHMOD} a+r; \ + ${FIND} ${DESTDIR}${TOMCAT_LIB} \( -type f -o -perm -u+x \) -print \ | ${XARGS} ${CHMOD} a+rx; \ - ${FIND} ${TOMCAT_LIB} -type d -print | ${XARGS} ${CHMOD} a+rx; \ - ${FIND} ${TOMCAT_LIB} -type f -name \*.bat -print | \ + ${FIND} ${DESTDIR}${TOMCAT_LIB} -type d -print | ${XARGS} ${CHMOD} a+rx; \ + ${FIND} ${DESTDIR}${TOMCAT_LIB} -type f -name \*.bat -print | \ ${XARGS} ${RM} -f) .include "../../mk/java-vm.mk" |