diff options
-rw-r--r-- | cad/geda-examples/Makefile | 11 | ||||
-rw-r--r-- | cad/lc/Makefile | 17 |
2 files changed, 15 insertions, 13 deletions
diff --git a/cad/geda-examples/Makefile b/cad/geda-examples/Makefile index d6a0cf034d5..ea436f2bad7 100644 --- a/cad/geda-examples/Makefile +++ b/cad/geda-examples/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2008/02/01 02:34:24 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.18 2008/03/03 01:40:21 jlam Exp $ # DISTNAME= geda-examples-${PKGVERSION} @@ -10,6 +10,8 @@ COMMENT= Examples for gEDA CONFLICTS+= gEDA<19991011 +PKG_DESTDIR_SUPPORT= destdir + .include "../../cad/geda/Makefile.common" GNU_CONFIGURE= YES @@ -22,13 +24,12 @@ pre-install: ${RM} -f ${WRKSRC}/configure.lineno do-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/geda + ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/geda cd ${WRKSRC} && ${TAR} cf - . | \ - (cd ${PREFIX}/share/examples/geda && ${TAR} xvf -) + (${DESTDIR}cd ${PREFIX}/share/examples/geda && ${TAR} xvf -) ${FIND} ${PREFIX}/share/examples/geda \ \( -name \*Makefile\* -o -name config.log -o -name config.status \) \ -exec ${RM} {} \; - ${CHOWN} -R ${SHAREOWN} ${PREFIX}/share/examples/geda - ${CHGRP} -R ${SHAREGRP} ${PREFIX}/share/examples/geda + ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${PREFIX}/share/examples/geda .include "../../mk/bsd.pkg.mk" diff --git a/cad/lc/Makefile b/cad/lc/Makefile index 136a92ff857..0fa1c7e27a1 100644 --- a/cad/lc/Makefile +++ b/cad/lc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2007/08/23 18:20:30 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2008/03/03 01:43:01 jlam Exp $ DISTNAME= lc # overridden below PKGNAME= lc-2.10 @@ -19,6 +19,8 @@ NO_BIN_ON_FTP= ${RESTRICTED} NO_SRC_ON_FTP= ${RESTRICTED} LICENSE= lc-license +PKG_DESTDIR_SUPPORT= destdir + WRKSRC= ${WRKDIR}/lc2.10 BUILD_DIRS= # empty @@ -53,12 +55,11 @@ PLIST_SUBST+= HAVE_LCSPICE="" INSTALLATION_DIRS= bin share do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bin/lc ${PREFIX}/bin/lc - ${INSTALL_PROGRAM} ${WRKSRC}/bin/lcplot ${PREFIX}/bin/lcplot - if test -f ${WRKSRC}/bin/spice ; then ${INSTALL_PROGRAM} ${WRKSRC}/bin/spice ${PREFIX}/bin/lcspice ; fi - cd ${PREFIX}/share && ${TAR} -zxf ${DISTDIR}/${DIST_SUBDIR}/lc_doc.tar.gz - ${CHMOD} -R ugo+rX ${PREFIX}/share/lc2.10 - ${CHOWN} -R ${SHAREOWN} ${PREFIX}/share/lc2.10 - ${CHGRP} -R ${SHAREGRP} ${PREFIX}/share/lc2.10 + ${INSTALL_PROGRAM} ${WRKSRC}/bin/lc ${DESTDIR}${PREFIX}/bin/lc + ${INSTALL_PROGRAM} ${WRKSRC}/bin/lcplot ${DESTDIR}${PREFIX}/bin/lcplot + if test -f ${WRKSRC}/bin/spice ; then ${INSTALL_PROGRAM} ${WRKSRC}/bin/spice ${DESTDIR}${PREFIX}/bin/lcspice ; fi + cd ${DESTDIR}${PREFIX}/share && ${TAR} -zxf ${DISTDIR}/${DIST_SUBDIR}/lc_doc.tar.gz + ${CHMOD} -R ugo+rX ${DESTDIR}${PREFIX}/share/lc2.10 + ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${PREFIX}/share/lc2.10 .include "../../mk/bsd.pkg.mk" |