We can't install these libraries into ${PREFIX}/lib, since mozilla
browsers might then falsely load these instead of their own. So: Install the libraries into their own directory. Bump PKGREVISION.
This commit is contained in:
parent
83553925e0
commit
671acfb337
3 changed files with 25 additions and 14 deletions
|
@ -1,6 +1,7 @@
|
|||
# $NetBSD: Makefile,v 1.3 2005/01/26 03:41:43 jschauma Exp $
|
||||
# $NetBSD: Makefile,v 1.4 2005/02/03 17:54:21 jschauma Exp $
|
||||
|
||||
DISTNAME= nspr-4.4.1
|
||||
PKGREVISION= 1
|
||||
CATEGORIES= devel
|
||||
MASTER_SITES?= ${MASTER_SIZE_MOZILLA:=nspr/releases/v4.4.1/src}
|
||||
|
||||
|
@ -20,7 +21,7 @@ AUTOCONF_REQD= 2.13
|
|||
|
||||
MAKE_ENV= DIST=${WRKSRC}/dist
|
||||
CONFIGURE_SCRIPT= ../configure
|
||||
CONFIGURE_ENV= LIBRUNPATH=${PREFIX}/lib
|
||||
CONFIGURE_ENV= LIBRUNPATH=${PREFIX}/lib/nspr
|
||||
|
||||
.include "../../mk/bsd.prefs.mk"
|
||||
|
||||
|
@ -38,8 +39,9 @@ pre-configure:
|
|||
|
||||
do-install:
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/include/nspr
|
||||
(cd ${WRKSRC}/dist/include && ${PAX} -Lrwvpe . ${PREFIX}/include/ )
|
||||
(cd ${WRKSRC}/dist/lib && ${PAX} -Lrwvpe . ${PREFIX}/lib/ )
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/lib/nspr
|
||||
(cd ${WRKSRC}/dist/include && ${PAX} -Lrwpe . ${PREFIX}/include/ )
|
||||
(cd ${WRKSRC}/dist/lib && ${PAX} -Lrwpe . ${PREFIX}/lib/nspr/ )
|
||||
${INSTALL_SCRIPT} ${WRKSRC}/config/nspr-config ${PREFIX}/bin
|
||||
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
@comment $NetBSD: PLIST,v 1.3 2005/01/25 14:56:41 jschauma Exp $
|
||||
@comment $NetBSD: PLIST,v 1.4 2005/02/03 17:54:21 jschauma Exp $
|
||||
bin/nspr-config
|
||||
include/nspr/md/_aix.h
|
||||
include/nspr/md/_aix32.cfg
|
||||
|
@ -129,13 +129,14 @@ include/nspr/prtrace.h
|
|||
include/nspr/prtypes.h
|
||||
include/nspr/prvrsion.h
|
||||
include/nspr/prwin16.h
|
||||
lib/libnspr4.a
|
||||
lib/libnspr4.${SO_SUFFIX}
|
||||
lib/libplc4.a
|
||||
lib/libplc4.${SO_SUFFIX}
|
||||
lib/libplds4.a
|
||||
lib/libplds4.${SO_SUFFIX}
|
||||
lib/nspr/libnspr4.a
|
||||
lib/nspr/libnspr4.${SO_SUFFIX}
|
||||
lib/nspr/libplc4.a
|
||||
lib/nspr/libplc4.${SO_SUFFIX}
|
||||
lib/nspr/libplds4.a
|
||||
lib/nspr/libplds4.${SO_SUFFIX}
|
||||
@dirrm include/nspr/private
|
||||
@dirrm include/nspr/obsolete
|
||||
@dirrm include/nspr/md
|
||||
@dirrm include/nspr
|
||||
@dirrm lib/nspr
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: buildlink3.mk,v 1.1 2005/01/25 14:50:39 jschauma Exp $
|
||||
# $NetBSD: buildlink3.mk,v 1.2 2005/02/03 17:54:21 jschauma Exp $
|
||||
|
||||
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
|
||||
NSPR_BUILDLINK3_MK:= ${NSPR_BUILDLINK3_MK}+
|
||||
|
@ -11,9 +11,17 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nnspr}
|
|||
BUILDLINK_PACKAGES+= nspr
|
||||
|
||||
.if !empty(NSPR_BUILDLINK3_MK:M+)
|
||||
BUILDLINK_DEPENDS.nspr+= nspr>=4.4.1
|
||||
BUILDLINK_RECOMMENDED.nspr+= nspr>=4.4.1
|
||||
BUILDLINK_DEPENDS.nspr+= nspr>=4.4.1nb1
|
||||
BUILDLINK_RECOMMENDED.nspr+= nspr>=4.4.1nb1
|
||||
BUILDLINK_PKGSRCDIR.nspr?= ../../devel/nspr
|
||||
|
||||
BUILDLINK_FILES.nspr+= lib/nspr/*
|
||||
BUILDLINK_FILES.nspr+= include/nspr/*
|
||||
|
||||
BUILDLINK_INCDIRS.nspr+= include/nspr
|
||||
BUILDLINK_LIBDIRS.nspr+= lib/nspr
|
||||
BUILDLINK_RPATHDIRS.nspr+= lib/nspr
|
||||
|
||||
.endif # NSPR_BUILDLINK3_MK
|
||||
|
||||
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
|
||||
|
|
Loading…
Reference in a new issue