Remove pkg-config *.pc files from standard place.
* Avoid potential conflicts between xulrunners. * Fix buildlink3.mk to handle pc files properly.
This commit is contained in:
parent
09956ff3c9
commit
e387224ef2
3 changed files with 5 additions and 9 deletions
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.12 2013/07/09 10:53:14 ryoon Exp $
|
||||
# $NetBSD: Makefile,v 1.13 2013/08/02 12:17:57 ryoon Exp $
|
||||
|
||||
.include "dist.mk"
|
||||
PKGNAME= xulrunner17-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/esr//}
|
||||
|
@ -77,7 +77,5 @@ post-install:
|
|||
${DESTDIR}${PREFIX}/lib/xulrunner17-sdk/sdk/lib
|
||||
ln -s ${PREFIX}/lib/xulrunner17/lib \
|
||||
${DESTDIR}${PREFIX}/lib/xulrunner17-sdk/lib
|
||||
${INSTALL_DATA} ${WRKSRC}/xulrunner/installer/*pc \
|
||||
${DESTDIR}${PREFIX}/lib/pkgconfig
|
||||
|
||||
.include "../../mk/bsd.pkg.mk"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
@comment $NetBSD: PLIST,v 1.4 2013/05/25 11:08:21 ryoon Exp $
|
||||
@comment $NetBSD: PLIST,v 1.5 2013/08/02 12:17:57 ryoon Exp $
|
||||
bin/xulrunner17
|
||||
include/xulrunner17/.mkdir.done
|
||||
include/xulrunner17/AccEvent.h
|
||||
|
@ -2538,10 +2538,6 @@ include/xulrunner17/ycbcr_to_rgb565.h
|
|||
include/xulrunner17/yuv_convert.h
|
||||
include/xulrunner17/yuv_row.h
|
||||
include/xulrunner17/zipstruct.h
|
||||
lib/pkgconfig/libxul-embedding.pc
|
||||
lib/pkgconfig/libxul.pc
|
||||
lib/pkgconfig/mozilla-js.pc
|
||||
lib/pkgconfig/mozilla-plugin.pc
|
||||
lib/xulrunner17/pkgconfig/libxul-embedding.pc
|
||||
lib/xulrunner17/pkgconfig/libxul.pc
|
||||
lib/xulrunner17/pkgconfig/mozilla-js.pc
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: buildlink3.mk,v 1.9 2013/06/06 12:53:45 wiz Exp $
|
||||
# $NetBSD: buildlink3.mk,v 1.10 2013/08/02 12:17:57 ryoon Exp $
|
||||
|
||||
BUILDLINK_TREE+= xulrunner17
|
||||
|
||||
|
@ -15,6 +15,8 @@ BUILDLINK_FILES.xulrunner17+= lib/xulrunner17/include/*.h
|
|||
|
||||
BUILDLINK_LIBDIRS.xulrunner17+= lib/xulrunner17/lib
|
||||
BUILDLINK_FILES.xulrunner17+= lib/xulrunner17/lib/*.so
|
||||
BUILDLINK_FILES.xulrunner17+= lib/xulrunner17/pkgconfig/*pc
|
||||
BUILDLINK_FNAME_TRANSFORM.xulrunner17+= -e "s|lib/xulrunner17/pkgconfig|lib/pkgconfig|"
|
||||
|
||||
pkgbase := xulrunner17
|
||||
.include "../../mk/pkg-build-options.mk"
|
||||
|
|
Loading…
Reference in a new issue