Mon Aug 3 14:25:26 2009 UTC ()
Fix DESTDIR installation.


(joerg)
diff -r1.15 -r1.16 pkgsrc/wm/icecc/Makefile
cvs diff -r1.15 -r1.16 pkgsrc/wm/icecc/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/wm/icecc/Attic/Makefile 2009/03/05 17:44:00 1.15
+++ pkgsrc/wm/icecc/Attic/Makefile 2009/08/03 14:25:26 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.15 2009/03/05 17:44:00 plunky Exp $ 1# $NetBSD: Makefile,v 1.16 2009/08/03 14:25:26 joerg Exp $
2 2
3# Package version reflects icecc version, with PKGREVISION incremented 3# Package version reflects icecc version, with PKGREVISION incremented
4# for any tool updates, according to the authors scheme. 4# for any tool updates, according to the authors scheme.
5DISTNAME= icecc-2.9 5DISTNAME= icecc-2.9
6PKGREVISION= 6 6PKGREVISION= 6
7CATEGORIES= wm 7CATEGORIES= wm
8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=icecc/} 8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=icecc/}
9DISTFILES= icecc-2.9.tar.bz2 \ 9DISTFILES= icecc-2.9.tar.bz2 \
10 icebgset-1.3.tar.bz2 \ 10 icebgset-1.3.tar.bz2 \
11 icecursorscfg-0.6.tar.bz2 \ 11 icecursorscfg-0.6.tar.bz2 \
12 iceked-1.5.tar.bz2 \ 12 iceked-1.5.tar.bz2 \
13 iceiconcvt-1.0.tar.bz2 \ 13 iceiconcvt-1.0.tar.bz2 \
14 icemergeprefs-0.5.tar.bz2 \ 14 icemergeprefs-0.5.tar.bz2 \
@@ -43,26 +43,30 @@ PYTHON_PATCH_SCRIPTS+= icerrun-0.5/icerr @@ -43,26 +43,30 @@ PYTHON_PATCH_SCRIPTS+= icerrun-0.5/icerr
43SUBST_CLASSES+= path 43SUBST_CLASSES+= path
44SUBST_STAGE.path= post-patch 44SUBST_STAGE.path= post-patch
45SUBST_FILES.path= icebgset-1.3/icebgset.pro icecc-2.9/icecc.pro iceked-1.5/iceked.pro 45SUBST_FILES.path= icebgset-1.3/icebgset.pro icecc-2.9/icecc.pro iceked-1.5/iceked.pro
46SUBST_FILES.path+= icemc-2.1/icemc.pro icesndcfg-1.3/icesndcfg.pro icets-1.4/icets.pro 46SUBST_FILES.path+= icemc-2.1/icemc.pro icesndcfg-1.3/icesndcfg.pro icets-1.4/icets.pro
47SUBST_FILES.path+= icewoed-1.8/icewoed.pro 47SUBST_FILES.path+= icewoed-1.8/icewoed.pro
48SUBST_FILES.path+= icecursorscfg-0.6/icecurcfg.py iceiconcvt-1.0/iceiconcvt.py 48SUBST_FILES.path+= icecursorscfg-0.6/icecurcfg.py iceiconcvt-1.0/iceiconcvt.py
49SUBST_FILES.path+= icemergeprefs-0.5/icemergeprefs.py 49SUBST_FILES.path+= icemergeprefs-0.5/icemergeprefs.py
50SUBST_SED.path= -e "s|/usr/local|${PREFIX}|g" 50SUBST_SED.path= -e "s|/usr/local|${PREFIX}|g"
51SUBST_MESSAGE.path= Fixing hardcoded paths. 51SUBST_MESSAGE.path= Fixing hardcoded paths.
52 52
53# VIM_SUBDIR comes from "editors/vim-share/version.mk" 53# VIM_SUBDIR comes from "editors/vim-share/version.mk"
54PLIST_SUBST+= VIM_SUBDIR=${VIM_SUBDIR:Q} 54PLIST_SUBST+= VIM_SUBDIR=${VIM_SUBDIR:Q}
55 55
 56INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
 57INSTALLATION_DIRS= bin share/vim/${VIM_SUBDIR}/ftplugin \
 58 share/vim/${VIM_SUBDIR}/syntax
 59
56do-configure: 60do-configure:
57. for dir in ${CONFIGURE_DIRS} 61. for dir in ${CONFIGURE_DIRS}
58 cd ${WRKSRC} && cd ${dir} && ${QTDIR}/bin/qmake QMAKE_MKDIR=${MKDIR:Q} QMAKE_CHK_DIR_EXISTS=${TEST:Q}\ -d 62 cd ${WRKSRC} && cd ${dir} && ${QTDIR}/bin/qmake QMAKE_MKDIR=${MKDIR:Q} QMAKE_CHK_DIR_EXISTS=${TEST:Q}\ -d
59. endfor 63. endfor
60 64
61post-build: 65post-build:
62 cd ${WRKSRC}/icewm4vim && ${SETENV} ${MAKE_ENV} ${GMAKE} QTDIR=${QTDIR:Q} 66 cd ${WRKSRC}/icewm4vim && ${SETENV} ${MAKE_ENV} ${GMAKE} QTDIR=${QTDIR:Q}
63 67
64post-install: 68post-install:
65. for script in ${PYTHON_PATCH_SCRIPTS} 69. for script in ${PYTHON_PATCH_SCRIPTS}
66 ${INSTALL_SCRIPT} ${WRKSRC}/${script:Q} ${DESTDIR}${PREFIX}/bin 70 ${INSTALL_SCRIPT} ${WRKSRC}/${script:Q} ${DESTDIR}${PREFIX}/bin
67. endfor 71. endfor
68 ${INSTALL_PROGRAM} ${WRKSRC}/icewm4vim/icecolsel ${DESTDIR}${PREFIX}/bin 72 ${INSTALL_PROGRAM} ${WRKSRC}/icewm4vim/icecolsel ${DESTDIR}${PREFIX}/bin