Mon Aug 3 14:46:24 2009 UTC ()
Fix DESTDIR support.


(joerg)
diff -r1.1.1.1 -r1.2 pkgsrc/geography/merkaartor/Makefile
cvs diff -r1.1.1.1 -r1.2 pkgsrc/geography/merkaartor/Makefile (expand / switch to unified diff)

--- pkgsrc/geography/merkaartor/Makefile 2009/06/04 10:57:59 1.1.1.1
+++ pkgsrc/geography/merkaartor/Makefile 2009/08/03 14:46:24 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.1.1.1 2009/06/04 10:57:59 drochner Exp $ 1# $NetBSD: Makefile,v 1.2 2009/08/03 14:46:24 joerg Exp $
2# 2#
3 3
4DISTNAME= merkaartor-0.13.2 4DISTNAME= merkaartor-0.13.2
5CATEGORIES= geography 5CATEGORIES= geography
6MASTER_SITES= http://www.merkaartor.org/downloads/source/ 6MASTER_SITES= http://www.merkaartor.org/downloads/source/
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= jkunz@NetBSD.org 9MAINTAINER= jkunz@NetBSD.org
10HOMEPAGE= http://www.merkaartor.org/ 10HOMEPAGE= http://www.merkaartor.org/
11COMMENT= Merkaartor is an openstreetmap mapping program 11COMMENT= Merkaartor is an openstreetmap mapping program
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
@@ -19,26 +19,28 @@ CONFIGURE_ARGS= PREFIX=${PREFIX} NODEBU @@ -19,26 +19,28 @@ CONFIGURE_ARGS= PREFIX=${PREFIX} NODEBU
19 19
20SUBST_CLASSES+= libxml2 20SUBST_CLASSES+= libxml2
21SUBST_MESSAGE.libxml2= Fixing hardcoded path: libxml2 21SUBST_MESSAGE.libxml2= Fixing hardcoded path: libxml2
22SUBST_STAGE.libxml2= post-configure 22SUBST_STAGE.libxml2= post-configure
23SUBST_FILES.libxml2= ${WRKSRC}/Makefile 23SUBST_FILES.libxml2= ${WRKSRC}/Makefile
24SUBST_SED.libxml2= -e "s:/usr/include/libxml2:${BUILDLINK_PREFIX.libxml2}/include/libxml2:g" 24SUBST_SED.libxml2= -e "s:/usr/include/libxml2:${BUILDLINK_PREFIX.libxml2}/include/libxml2:g"
25 25
26SUBST_CLASSES+= installtarget 26SUBST_CLASSES+= installtarget
27SUBST_MESSAGE.installtarget= Fixing wrong install target 27SUBST_MESSAGE.installtarget= Fixing wrong install target
28SUBST_STAGE.installtarget= post-configure 28SUBST_STAGE.installtarget= post-configure
29SUBST_FILES.installtarget= ${WRKSRC}/Makefile 29SUBST_FILES.installtarget= ${WRKSRC}/Makefile
30SUBST_SED.installtarget= -e 's:--mode=install cp "$$(QMAKE_TARGET)":--mode=install cp "$$(TARGET)":' 30SUBST_SED.installtarget= -e 's:--mode=install cp "$$(QMAKE_TARGET)":--mode=install cp "$$(TARGET)":'
31 31
 32INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
 33
32do-configure: 34do-configure:
33 cd ${WRKSRC} && \ 35 cd ${WRKSRC} && \
34 ${QTDIR}/bin/lrelease Merkaartor.pro 36 ${QTDIR}/bin/lrelease Merkaartor.pro
35 cd ${WRKSRC} && \ 37 cd ${WRKSRC} && \
36 ${QMAKE} ${CONFIGURE_ARGS} Merkaartor.pro 38 ${QMAKE} ${CONFIGURE_ARGS} Merkaartor.pro
37 39
38.include "../../misc/proj/buildlink3.mk" 40.include "../../misc/proj/buildlink3.mk"
39.include "../../geography/gdal-lib/buildlink3.mk" 41.include "../../geography/gdal-lib/buildlink3.mk"
40.include "../../geography/gpsd/buildlink3.mk" 42.include "../../geography/gpsd/buildlink3.mk"
41.include "../../graphics/exiv2/buildlink3.mk" 43.include "../../graphics/exiv2/buildlink3.mk"
42.include "../../graphics/tiff/buildlink3.mk" 44.include "../../graphics/tiff/buildlink3.mk"
43.include "../../textproc/libxml2/buildlink3.mk" 45.include "../../textproc/libxml2/buildlink3.mk"
44.include "../../textproc/libxslt/buildlink3.mk" 46.include "../../textproc/libxslt/buildlink3.mk"