Sat Apr 5 00:34:07 2008 UTC ()
Fix DESTDIR installation.


(joerg)
diff -r1.38 -r1.39 pkgsrc/archivers/p7zip/Makefile
cvs diff -r1.38 -r1.39 pkgsrc/archivers/p7zip/Makefile (expand / switch to unified diff)

--- pkgsrc/archivers/p7zip/Makefile 2008/03/02 03:48:36 1.38
+++ pkgsrc/archivers/p7zip/Makefile 2008/04/05 00:34:07 1.39
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.38 2008/03/02 03:48:36 jlam Exp $ 1# $NetBSD: Makefile,v 1.39 2008/04/05 00:34:07 joerg Exp $
2 2
3DISTNAME= p7zip_4.57_src_all 3DISTNAME= p7zip_4.57_src_all
4PKGNAME= p7zip-4.57 4PKGNAME= p7zip-4.57
5CATEGORIES= archivers 5CATEGORIES= archivers
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=p7zip/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=p7zip/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= wiz@NetBSD.org 9MAINTAINER= wiz@NetBSD.org
10HOMEPAGE= http://p7zip.sourceforge.net/ 10HOMEPAGE= http://p7zip.sourceforge.net/
11COMMENT= File archiver with high compression 11COMMENT= File archiver with high compression
12 12
13PKG_INSTALLATION_TYPES= overwrite pkgviews 13PKG_INSTALLATION_TYPES= overwrite pkgviews
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
@@ -50,27 +50,27 @@ CFLAGS+= -DBIG_ENDIAN @@ -50,27 +50,27 @@ CFLAGS+= -DBIG_ENDIAN
50CFLAGS+= -DLITTLE_ENDIAN 50CFLAGS+= -DLITTLE_ENDIAN
51.endif 51.endif
52 52
53do-install: 53do-install:
54 ${INSTALL_PROGRAM} ${WRKSRC}/bin/7za ${DESTDIR}${PREFIX}/bin 54 ${INSTALL_PROGRAM} ${WRKSRC}/bin/7za ${DESTDIR}${PREFIX}/bin
55.if !empty(DYNAMIC_7Z:MYES) 55.if !empty(DYNAMIC_7Z:MYES)
56 ${INSTALL_PROGRAM} ${WRKSRC}/bin/7z ${DESTDIR}${PREFIX}/lib/7z 56 ${INSTALL_PROGRAM} ${WRKSRC}/bin/7z ${DESTDIR}${PREFIX}/lib/7z
57 ln -s ${PREFIX}/lib/7z/7z ${DESTDIR}${PREFIX}/bin 57 ln -s ${PREFIX}/lib/7z/7z ${DESTDIR}${PREFIX}/bin
58 ${INSTALL_LIB} ${WRKSRC}/bin/Codecs/* \ 58 ${INSTALL_LIB} ${WRKSRC}/bin/Codecs/* \
59 ${DESTDIR}${PREFIX}/lib/7z/Codecs 59 ${DESTDIR}${PREFIX}/lib/7z/Codecs
60 ${INSTALL_LIB} ${WRKSRC}/bin/Formats/* \ 60 ${INSTALL_LIB} ${WRKSRC}/bin/Formats/* \
61 ${DESTDIR}${PREFIX}/lib/7z/Formats 61 ${DESTDIR}${PREFIX}/lib/7z/Formats
62.else 62.else
63 ln -s 7za ${PREFIX}/bin/7z 63 ln -s 7za ${DESTDIR}${PREFIX}/bin/7z
64.endif 64.endif
65 ${INSTALL_DATA} ${WRKSRC}/README \ 65 ${INSTALL_DATA} ${WRKSRC}/README \
66 ${DESTDIR}${PREFIX}/share/doc/p7zip 66 ${DESTDIR}${PREFIX}/share/doc/p7zip
67 ${INSTALL_DATA} ${WRKSRC}/DOCS/MANUAL/*.* \ 67 ${INSTALL_DATA} ${WRKSRC}/DOCS/MANUAL/*.* \
68 ${DESTDIR}${PREFIX}/share/doc/p7zip 68 ${DESTDIR}${PREFIX}/share/doc/p7zip
69 ${INSTALL_DATA} ${WRKSRC}/DOCS/MANUAL/commands/*.* \ 69 ${INSTALL_DATA} ${WRKSRC}/DOCS/MANUAL/commands/*.* \
70 ${DESTDIR}${PREFIX}/share/doc/p7zip/commands 70 ${DESTDIR}${PREFIX}/share/doc/p7zip/commands
71 ${INSTALL_DATA} ${WRKSRC}/DOCS/MANUAL/switches/*.* \ 71 ${INSTALL_DATA} ${WRKSRC}/DOCS/MANUAL/switches/*.* \
72 ${DESTDIR}${PREFIX}/share/doc/p7zip/switches 72 ${DESTDIR}${PREFIX}/share/doc/p7zip/switches
73 ${INSTALL_MAN} ${WRKSRC}/man1/7z.1 \ 73 ${INSTALL_MAN} ${WRKSRC}/man1/7z.1 \
74 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 74 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
75 ${INSTALL_MAN} ${WRKSRC}/man1/7za.1 \ 75 ${INSTALL_MAN} ${WRKSRC}/man1/7za.1 \
76 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 76 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1