diff options
-rw-r--r-- | print/poppler-glib/Makefile | 8 | ||||
-rw-r--r-- | print/poppler-qt/Makefile | 14 | ||||
-rw-r--r-- | print/poppler/Makefile | 9 | ||||
-rw-r--r-- | print/poppler/Makefile.common | 4 |
4 files changed, 20 insertions, 15 deletions
diff --git a/print/poppler-glib/Makefile b/print/poppler-glib/Makefile index 75d86b107f2..276bc6cd61d 100644 --- a/print/poppler-glib/Makefile +++ b/print/poppler-glib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2007/02/22 19:27:05 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2007/08/09 18:42:51 joerg Exp $ # .include "../../print/poppler/Makefile.common" @@ -28,9 +28,11 @@ BUILD_DIRS= ${WRKSRC}/goo ${WRKSRC}/fofi ${WRKSRC}/poppler \ ${WRKSRC}/glib INSTALL_DIRS= ${WRKSRC}/glib +INSTALLATION_DIRS+= lib/pkgconfig + post-install: - ${INSTALL_DATA} ${WRKSRC}/poppler-cairo.pc ${PREFIX}/lib/pkgconfig - ${INSTALL_DATA} ${WRKSRC}/poppler-glib.pc ${PREFIX}/lib/pkgconfig + ${INSTALL_DATA} ${WRKSRC}/poppler-cairo.pc ${DESTDIR}${PREFIX}/lib/pkgconfig + ${INSTALL_DATA} ${WRKSRC}/poppler-glib.pc ${DESTDIR}${PREFIX}/lib/pkgconfig .include "../../devel/glib2/buildlink3.mk" .include "../../graphics/cairo/buildlink3.mk" diff --git a/print/poppler-qt/Makefile b/print/poppler-qt/Makefile index 6c04fb669df..2c2da2e4dce 100644 --- a/print/poppler-qt/Makefile +++ b/print/poppler-qt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/10/13 20:25:22 markd Exp $ +# $NetBSD: Makefile,v 1.15 2007/08/09 18:42:51 joerg Exp $ # .include "../../print/poppler/Makefile.common" @@ -12,6 +12,8 @@ PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-qt.pc.in INCS=-I. -I.. -I../poppler `pkg-config poppler --cflags` -I${QTDIR}/include +INSTALLATION_DIRS+= lib include/poppler lib/pkgconfig + do-build: (cd ${WRKSRC}/qt; \ ${LIBTOOL} --tag=CXX --mode=compile ${CXX} ${CXXFLAGS} ${INCS} -c -o poppler-document.lo poppler-document.cc; \ @@ -25,13 +27,13 @@ do-build: ${WRKSRC}/poppler-qt.pc.in > ${WRKSRC}/poppler-qt.pc do-install: - ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/qt/libpoppler-qt.la ${PREFIX}/lib - ${INSTALL_DATA} ${WRKSRC}/qt/poppler-qt.h ${PREFIX}/include/poppler + ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/qt/libpoppler-qt.la ${DESTDIR}${PREFIX}/lib + ${INSTALL_DATA} ${WRKSRC}/qt/poppler-qt.h ${DESTDIR}${PREFIX}/include/poppler ${INSTALL_DATA} ${WRKSRC}/qt/poppler-page-transition.h \ - ${PREFIX}/include/poppler + ${DESTDIR}${PREFIX}/include/poppler ${INSTALL_DATA} ${WRKSRC}/qt/poppler-link-qt3.h \ - ${PREFIX}/include/poppler - ${INSTALL_DATA} ${WRKSRC}/poppler-qt.pc ${PREFIX}/lib/pkgconfig + ${DESTDIR}${PREFIX}/include/poppler + ${INSTALL_DATA} ${WRKSRC}/poppler-qt.pc ${DESTDIR}${PREFIX}/lib/pkgconfig BUILDLINK_API_DEPENDS.poppler+= poppler>=${POPPLER_VERS} .include "../../print/poppler/buildlink3.mk" diff --git a/print/poppler/Makefile b/print/poppler/Makefile index 691f1a51b60..98379c37de5 100644 --- a/print/poppler/Makefile +++ b/print/poppler/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2007/08/02 14:41:18 drochner Exp $ +# $NetBSD: Makefile,v 1.22 2007/08/09 18:42:51 joerg Exp $ # .include "../../print/poppler/Makefile.common" @@ -14,7 +14,7 @@ PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-splash.pc.in PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler.pc.in GNU_CONFIGURE= yes -INSTALLATION_DIRS+= share/doc/poppler +INSTALLATION_DIRS+= include/poppler share/doc/poppler CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} # TODO: Later add an option to choose Splash versus Cairo backend. @@ -38,9 +38,8 @@ CONFIGURE_ARGS+= --enable-a4-paper .endif post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/include/poppler - ${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/poppler/ - ${INSTALL_MAN} ${WRKSRC}/README-XPDF ${PREFIX}/share/doc/poppler/ + ${INSTALL_MAN} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/poppler/ + ${INSTALL_MAN} ${WRKSRC}/README-XPDF ${DESTDIR}${PREFIX}/share/doc/poppler/ .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" diff --git a/print/poppler/Makefile.common b/print/poppler/Makefile.common index 3f67e7f94ba..7c9ff2b7bca 100644 --- a/print/poppler/Makefile.common +++ b/print/poppler/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.7 2006/10/12 14:12:15 drochner Exp $ +# $NetBSD: Makefile.common,v 1.8 2007/08/09 18:42:51 joerg Exp $ # POPPLER_VERS= 0.5.4 @@ -9,6 +9,8 @@ MASTER_SITES= http://poppler.freedesktop.org/ MAINTAINER= reed@reedmedia.net HOMEPAGE= http://poppler.freedesktop.org/ +PKG_DESTDIR_SUPPORT= user-destdir + DISTINFO_FILE= ${.CURDIR}/../../print/poppler/distinfo PATCHDIR= ${.CURDIR}/../../print/poppler/patches |