diff options
| author | jlam <jlam@pkgsrc.org> | 2001-05-24 08:53:54 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-05-24 08:53:54 +0000 |
| commit | 54718a4db7a73e26f6c276f352e0682c36b5c527 (patch) | |
| tree | 5f91b7729fd1bdb67af0af17bb78b53ca29f8bd6 /net | |
| parent | a7c8e855cba1fc8efee19d3a05c929de3572328e (diff) | |
| download | pkgsrc-54718a4db7a73e26f6c276f352e0682c36b5c527.tar.gz | |
Standardize name of file to include for build-links to be "buildlink.mk".
Use BUILDLINK_INCDIR, BUILDLINK_LIBDIR for locations of linked headers
and libraries. Create a variable BUILDLINK_TARGETS whose value is the
list of build-link targets to execute.
Diffstat (limited to 'net')
| -rw-r--r-- | net/ncftp2/Makefile | 10 | ||||
| -rw-r--r-- | net/samba/Makefile | 10 |
2 files changed, 11 insertions, 9 deletions
diff --git a/net/ncftp2/Makefile b/net/ncftp2/Makefile index 65326c7dd86..16195ba7267 100644 --- a/net/ncftp2/Makefile +++ b/net/ncftp2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2001/05/16 20:27:23 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2001/05/24 08:53:57 jlam Exp $ # FreeBSD Id: Makefile,v 1.39 1998/01/31 17:49:48 jseger Exp # @@ -30,12 +30,12 @@ DEPENDS+= socks5-1.0.2:../../net/socks5 .endif .endif -.include "../../devel/readline/Makefile.readline" +.include "../../devel/readline/buildlink.mk" -CPPFLAGS+= -I${WRKINCDIR} -LDFLAGS+= -L${WRKLIBDIR} +CPPFLAGS+= -I${BUILDLINK_INCDIR} +LDFLAGS+= -L${BUILDLINK_LIBDIR} -pre-configure: link-readline-headers link-readline-libs +pre-configure: ${BUILDLINK_TARGETS} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ncftp ${PREFIX}/bin/ncftp2 diff --git a/net/samba/Makefile b/net/samba/Makefile index 3f21cbc52b3..879484119dd 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2001/05/22 21:49:28 jlam Exp $ +# $NetBSD: Makefile,v 1.51 2001/05/24 08:53:57 jlam Exp $ DISTNAME= samba-2.2.0 WRKSRC= ${WRKDIR}/${DISTNAME}/source @@ -24,10 +24,10 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig USE_GNU_READLINE= # uses rl_event_hook interface to GNU readline .include "../../mk/bsd.prefs.mk" -.include "../../devel/readline/Makefile.readline" +.include "../../devel/readline/buildlink.mk" -CFLAGS+= -I${WRKINCDIR} -LDFLAGS+= -L${WRKLIBDIR} +CFLAGS+= -I${BUILDLINK_INCDIR} +LDFLAGS+= -L${BUILDLINK_LIBDIR} SAMBA_LOGDIR= /var/log SAMBA_LOCKDIR= /var/run/samba @@ -79,6 +79,8 @@ HTMLDIR= ${PREFIX}/share/doc/html/samba post-extract: ${FIND} ${WRKDIR}/${DISTNAME} -name ".cvsignore" -exec ${RM} -f {} \; +pre-configure: ${BUILDLINK_TARGETS} + pre-install: for file in nmbd.sh smbd.sh; do \ ${SED} -e "s,@PREFIX@,${PREFIX},g" \ |