diff options
| author | tron <tron> | 1999-04-10 21:49:05 +0000 |
|---|---|---|
| committer | tron <tron> | 1999-04-10 21:49:05 +0000 |
| commit | b3cb106848c0f9eb7dc705d1722ab463cdfe7142 (patch) | |
| tree | da7626480a8367a55bed5cdd5b41d62be330286f /lang/tclX80 | |
| parent | 5340da772a067b4ba6d96110bd18b28af4e84517 (diff) | |
| download | pkgsrc-b3cb106848c0f9eb7dc705d1722ab463cdfe7142.tar.gz | |
Use "BSD_INSTALL_..." instead of "INSTALL_..." in patches because these
are always added to the "make" environment.
Diffstat (limited to 'lang/tclX80')
| -rw-r--r-- | lang/tclX80/Makefile | 4 | ||||
| -rw-r--r-- | lang/tclX80/patches/patch-ab | 6 | ||||
| -rw-r--r-- | lang/tclX80/patches/patch-ac | 6 |
3 files changed, 7 insertions, 9 deletions
diff --git a/lang/tclX80/Makefile b/lang/tclX80/Makefile index 375088f9abd..3e0c2e4aa18 100644 --- a/lang/tclX80/Makefile +++ b/lang/tclX80/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 1999/04/05 22:55:36 tron Exp $ +# $NetBSD: Makefile,v 1.9 1999/04/10 21:49:05 tron Exp $ # DISTNAME= tclX8.0.4 @@ -17,7 +17,5 @@ CONFIGURE_ARGS+= --enable-shared --with-tk CONFIGURE_ENV+= TCL_SHLIB_LD_LIBS=-L${PREFIX}/lib WRKSRC= ${WRKDIR}/tclX8.0.4/unix -MAKE_ENV+= INSTALL_DATA="${INSTALL_DATA}" \ - INSTALL_PROGRAM="${INSTALL_PROGRAM}" .include "../../mk/bsd.pkg.mk" diff --git a/lang/tclX80/patches/patch-ab b/lang/tclX80/patches/patch-ab index e157d3b837c..0096dd291e2 100644 --- a/lang/tclX80/patches/patch-ab +++ b/lang/tclX80/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.3 1999/04/05 22:55:36 tron Exp $ +$NetBSD: patch-ab,v 1.4 1999/04/10 21:49:05 tron Exp $ --- ../tcl/unix/Makefile.in.orig Mon Dec 7 04:47:24 1998 +++ ../tcl/unix/Makefile.in Mon Apr 5 23:08:01 1999 @@ -51,13 +51,13 @@ $NetBSD: patch-ab,v 1.3 1999/04/05 22:55:36 tron Exp $ - ${INSTCOPY} ${TCLX_STLIB_NAME} ${INSTALL_ROOT}${TCLX_INST_LIB}; \ - ${RANLIB} ${INSTALL_ROOT}${TCLX_INST_LIB}/${TCLX_STLIB_NAME}; \ - fi -+ ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} tcl ${INSTALL_ROOT}${TCLX_INST_BIN} ++ ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} tcl ${INSTALL_ROOT}${TCLX_INST_BIN} ${INSTCOPY} tclxConfig.sh ${INSTALL_ROOT}${TCLX_INST_LIB} - if test "@BUILD_SHARED@" = "YES"; then \ - ${INSTCOPY} ${TCLX_SHLIB_NAME} ${INSTALL_ROOT}${TCLX_INST_LIB} ;\ - ${INSTCOPY} pkgIndex.tcl ${INSTALL_ROOT}${TCLX_EXEC_RUNTIME} ;\ - fi -+ ${LIBTOOL} --mode=install ${INSTALL_DATA} ${TCLX_STLIB_NAME:.a=.la} ${PREFIX}/lib ++ ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} ${TCLX_STLIB_NAME:.a=.la} ${PREFIX}/lib + ${INSTCOPY} pkgIndex.tcl ${INSTALL_ROOT}${TCLX_EXEC_RUNTIME} #------------------------------------------------------------------------------ diff --git a/lang/tclX80/patches/patch-ac b/lang/tclX80/patches/patch-ac index a9e6c1e66ba..1294c476fcd 100644 --- a/lang/tclX80/patches/patch-ac +++ b/lang/tclX80/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.3 1999/04/05 22:55:36 tron Exp $ +$NetBSD: patch-ac,v 1.4 1999/04/10 21:49:05 tron Exp $ --- ../tk/unix/Makefile.in.orig Mon Dec 7 04:47:30 1998 +++ ../tk/unix/Makefile.in Mon Apr 5 23:08:17 1999 @@ -55,13 +55,13 @@ $NetBSD: patch-ac,v 1.3 1999/04/05 22:55:36 tron Exp $ - ${INSTCOPY} ${TKX_STLIB_NAME} ${INSTALL_ROOT}${TKX_INST_LIB}; \ - ${RANLIB} ${INSTALL_ROOT}${TKX_INST_LIB}/${TKX_STLIB_NAME}; \ - fi -+ ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} wishx ${INSTALL_ROOT}${TKX_INST_BIN} ++ ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} wishx ${INSTALL_ROOT}${TKX_INST_BIN} ${INSTCOPY} tkxConfig.sh ${INSTALL_ROOT}${TKX_INST_LIB} - if test "@BUILD_SHARED@" = "YES"; then \ - ${INSTCOPY} ${TKX_SHLIB_NAME} ${INSTALL_ROOT}${TKX_INST_LIB} ;\ - ${INSTCOPY} pkgIndex.tcl ${INSTALL_ROOT}${TKX_EXEC_RUNTIME} ;\ - fi -+ ${LIBTOOL} --mode=install ${INSTALL_DATA} ${TKX_STLIB_NAME:.a=.la} ${PREFIX}/lib ++ ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} ${TKX_STLIB_NAME:.a=.la} ${PREFIX}/lib + ${INSTCOPY} pkgIndex.tcl ${INSTALL_ROOT}${TKX_EXEC_RUNTIME} ${INSTCOPY} tclhelp ${INSTALL_ROOT}${TKX_INST_BIN} |