Mon Feb 25 07:23:03 2008 UTC ()
Add missing ${DESTDIR}, fixes installation problem with USE_DESTDIR.
Noticed by Rumko in pkgsrc-users@.


(obache)
diff -r1.72 -r1.73 pkgsrc/sysutils/mc/Makefile
cvs diff -r1.72 -r1.73 pkgsrc/sysutils/mc/Makefile (switch to unified diff)

--- pkgsrc/sysutils/mc/Makefile 2008/02/14 12:26:56 1.72
+++ pkgsrc/sysutils/mc/Makefile 2008/02/25 07:23:03 1.73
@@ -1,57 +1,57 @@ @@ -1,57 +1,57 @@
1# $NetBSD: Makefile,v 1.72 2008/02/14 12:26:56 drochner Exp $ 1# $NetBSD: Makefile,v 1.73 2008/02/25 07:23:03 obache Exp $
2 2
3DISTNAME= mc-4.6.1 3DISTNAME= mc-4.6.1
4PKGREVISION= 4 4PKGREVISION= 4
5CATEGORIES= sysutils 5CATEGORIES= sysutils
6MASTER_SITES= http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/ \ 6MASTER_SITES= http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/ \
7 ${MASTER_SITE_SUNSITE:=utils/file/managers/mc/} 7 ${MASTER_SITE_SUNSITE:=utils/file/managers/mc/}
8 8
9MAINTAINER= pavel.arnost@clnet.cz 9MAINTAINER= pavel.arnost@clnet.cz
10HOMEPAGE= http://www.ibiblio.org/mc/ 10HOMEPAGE= http://www.ibiblio.org/mc/
11COMMENT= User-friendly file manager and visual shell 11COMMENT= User-friendly file manager and visual shell
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14PKG_INSTALLATION_TYPES= overwrite pkgviews 14PKG_INSTALLATION_TYPES= overwrite pkgviews
15 15
16USE_TOOLS+= pkg-config unzip:run zip:run 16USE_TOOLS+= pkg-config unzip:run zip:run
17GNU_CONFIGURE= YES 17GNU_CONFIGURE= YES
18USE_PKGLOCALEDIR= YES 18USE_PKGLOCALEDIR= YES
19 19
20.include "../../mk/bsd.prefs.mk" 20.include "../../mk/bsd.prefs.mk"
21 21
22.if ${OPSYS} == "Linux" 22.if ${OPSYS} == "Linux"
23PLIST_SRC+= ${PKGDIR}/PLIST.cons.saver 23PLIST_SRC+= ${PKGDIR}/PLIST.cons.saver
24.endif 24.endif
25 25
26# we need working e2fsprogs and gpm packages first 26# we need working e2fsprogs and gpm packages first
27CONFIGURE_ARGS+= --without-ext2undel 27CONFIGURE_ARGS+= --without-ext2undel
28CONFIGURE_ARGS+= --without-gpm-mouse 28CONFIGURE_ARGS+= --without-gpm-mouse
29CONFIGURE_ARGS+= UNZIP=${TOOLS_PATH.unzip} ZIP=${TOOLS_PATH.zip} 29CONFIGURE_ARGS+= UNZIP=${TOOLS_PATH.unzip} ZIP=${TOOLS_PATH.zip}
30 30
31PLIST_SRC+= ${PKGDIR}/PLIST 31PLIST_SRC+= ${PKGDIR}/PLIST
32.include "options.mk" 32.include "options.mk"
33PLIST_SRC+= ${PKGDIR}/PLIST.end 33PLIST_SRC+= ${PKGDIR}/PLIST.end
34 34
35PKG_SYSCONFSUBDIR= mc 35PKG_SYSCONFSUBDIR= mc
36SUBST_CLASSES+= conf 36SUBST_CLASSES+= conf
37SUBST_STAGE.conf= post-patch 37SUBST_STAGE.conf= post-patch
38SUBST_FILES.conf= vfs/extfs.c vfs/sfs.c 38SUBST_FILES.conf= vfs/extfs.c vfs/sfs.c
39SUBST_VARS.conf= PKG_SYSCONFDIR 39SUBST_VARS.conf= PKG_SYSCONFDIR
40 40
41.if !empty(PKG_OPTIONS:Mvfs) 41.if !empty(PKG_OPTIONS:Mvfs)
42EGDIR= ${PREFIX}/share/examples/mc 42EGDIR= ${PREFIX}/share/examples/mc
43CONF_FILES+= ${EGDIR}/extfs.ini ${PKG_SYSCONFDIR}/extfs.ini 43CONF_FILES+= ${EGDIR}/extfs.ini ${PKG_SYSCONFDIR}/extfs.ini
44CONF_FILES+= ${EGDIR}/sfs.ini ${PKG_SYSCONFDIR}/sfs.ini 44CONF_FILES+= ${EGDIR}/sfs.ini ${PKG_SYSCONFDIR}/sfs.ini
45.endif 45.endif
46 46
47post-install: 47post-install:
48# remove dir if no extensions were installed there 48# remove dir if no extensions were installed there
49 rmdir ${DESTDIR}${PREFIX:Q}/lib/mc 2>/dev/null || ${TRUE} 49 rmdir ${DESTDIR}${PREFIX:Q}/lib/mc 2>/dev/null || ${TRUE}
50.if !empty(PKG_OPTIONS:Mvfs) 50.if !empty(PKG_OPTIONS:Mvfs)
51 ${INSTALL_DATA_DIR} ${EGDIR} 51 ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
52 ${INSTALL_DATA} ${WRKSRC}/vfs/extfs/extfs.ini ${EGDIR} 52 ${INSTALL_DATA} ${WRKSRC}/vfs/extfs/extfs.ini ${DESTDIR}${EGDIR}
53 ${INSTALL_DATA} ${WRKSRC}/vfs/extfs/sfs.ini ${EGDIR} 53 ${INSTALL_DATA} ${WRKSRC}/vfs/extfs/sfs.ini ${DESTDIR}${EGDIR}
54.endif 54.endif
55 55
56.include "../../devel/gettext-lib/buildlink3.mk" 56.include "../../devel/gettext-lib/buildlink3.mk"
57.include "../../mk/bsd.pkg.mk" 57.include "../../mk/bsd.pkg.mk"