pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/print Add DESTDIR support.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/23b6d59387f7
branches:  trunk
changeset: 531988:23b6d59387f7
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Aug 09 18:42:51 2007 +0000

description:
Add DESTDIR support.

diffstat:

 print/poppler-glib/Makefile   |   8 +++++---
 print/poppler-qt/Makefile     |  14 ++++++++------
 print/poppler/Makefile        |   9 ++++-----
 print/poppler/Makefile.common |   4 +++-
 4 files changed, 20 insertions(+), 15 deletions(-)

diffs (108 lines):

diff -r 5898412be32c -r 23b6d59387f7 print/poppler-glib/Makefile
--- a/print/poppler-glib/Makefile       Thu Aug 09 18:28:24 2007 +0000
+++ b/print/poppler-glib/Makefile       Thu Aug 09 18:42:51 2007 +0000
@@ -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 @@
                        ${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 -r 5898412be32c -r 23b6d59387f7 print/poppler-qt/Makefile
--- a/print/poppler-qt/Makefile Thu Aug 09 18:28:24 2007 +0000
+++ b/print/poppler-qt/Makefile Thu Aug 09 18:42:51 2007 +0000
@@ -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 @@
 
 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 @@
        ${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 -r 5898412be32c -r 23b6d59387f7 print/poppler/Makefile
--- a/print/poppler/Makefile    Thu Aug 09 18:28:24 2007 +0000
+++ b/print/poppler/Makefile    Thu Aug 09 18:42:51 2007 +0000
@@ -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.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 @@
 .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 -r 5898412be32c -r 23b6d59387f7 print/poppler/Makefile.common
--- a/print/poppler/Makefile.common     Thu Aug 09 18:28:24 2007 +0000
+++ b/print/poppler/Makefile.common     Thu Aug 09 18:42:51 2007 +0000
@@ -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 @@
 MAINTAINER=            reed%reedmedia.net@localhost
 HOMEPAGE=              http://poppler.freedesktop.org/
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 DISTINFO_FILE=         ${.CURDIR}/../../print/poppler/distinfo
 PATCHDIR=              ${.CURDIR}/../../print/poppler/patches
 



Home | Main Index | Thread Index | Old Index