From 3c29e69b1b9a2ab829eb1a471b17bb8d1b009c0d Mon Sep 17 00:00:00 2001 From: joerg Date: Mon, 7 Apr 2008 17:14:20 +0000 Subject: Fix DESTDIR. --- chat/iip/Makefile | 5 ++--- chat/ircu/Makefile | 6 ++---- comms/gkermit/Makefile | 7 +++---- devel/gflib/Makefile | 4 +++- emulators/gnuboy-sdl/Makefile | 6 +++--- games/gogui/Makefile | 7 +++---- mail/ifile-procmail/Makefile | 6 +++--- multimedia/ggrab/Makefile | 5 +++-- 8 files changed, 22 insertions(+), 24 deletions(-) diff --git a/chat/iip/Makefile b/chat/iip/Makefile index 3501fa4c6a1..1b1c41e7713 100644 --- a/chat/iip/Makefile +++ b/chat/iip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2008/03/03 02:19:51 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2008/04/07 17:22:11 joerg Exp $ # DISTNAME= iip-1.1.0 @@ -18,11 +18,10 @@ MAKE_FLAGS+= LD=${CC:Q} MAKE_FLAGS+= LDFLAGS=${LDFLAGS:M*:Q} MAKE_FLAGS+= CFLAGS=${CFLAGS:M*:Q}\ ${CPPFLAGS:M*:Q}\ -I. -INSTALLATION_DIRS= bin +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/examples/iip do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/isproxy ${DESTDIR}${PREFIX}/bin/ - ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/iip ${INSTALL_DATA} ${WRKSRC}/src/node.ref \ ${DESTDIR}${PREFIX}/share/examples/iip/ ${INSTALL_DATA} ${WRKSRC}/doc/isproxy.1 \ diff --git a/chat/ircu/Makefile b/chat/ircu/Makefile index f034e513572..c1dfefc5716 100644 --- a/chat/ircu/Makefile +++ b/chat/ircu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2008/03/24 18:40:18 adrianp Exp $ +# $NetBSD: Makefile,v 1.33 2008/04/07 17:22:48 joerg Exp $ # DISTNAME= ircu2.10.12.12 @@ -59,11 +59,9 @@ PKG_USERS= ${IRCD_USER}:${IRCD_GROUP} PKG_GECOS.${IRCD_USER}= IRC server user PKG_SHELL.${IRCD_USER}= ${SH} -INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin +INSTALLATION_DIRS= bin ${PKGMANDIR}/man8 sbin ${DOCDIR} ${EGDIR} do-install: - ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR} - ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR} ${INSTALL_PROGRAM} ${WRKSRC}/ircd/ircd ${DESTDIR}${PREFIX}/sbin ${INSTALL_PROGRAM} ${WRKSRC}/ircd/umkpasswd ${DESTDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/ircd/convert-conf \ diff --git a/comms/gkermit/Makefile b/comms/gkermit/Makefile index 86acb849ca8..7eabcd6d3d2 100644 --- a/comms/gkermit/Makefile +++ b/comms/gkermit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2008/03/03 05:33:32 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2008/04/07 17:15:48 joerg Exp $ # DISTNAME= gku100 @@ -23,13 +23,12 @@ MAKE_ENV+= KFLAGS=${CFLAGS:M*:Q} CFLAGS+= -DERRNO_H -INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/doc/gkermit do-install: ${INSTALL_PROGRAM} ${WRKSRC}/gkermit ${DESTDIR}${PREFIX}/bin/gkermit ${INSTALL_MAN} ${WRKSRC}/gkermit.nr \ ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/gkermit.1 - ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/gkermit - ${INSTALL_DATA} ${DESTDIR}${WRKSRC}/README ${PREFIX}/share/doc/gkermit + ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/gkermit .include "../../mk/bsd.pkg.mk" diff --git a/devel/gflib/Makefile b/devel/gflib/Makefile index 62f36f6a241..62b2debc7cd 100644 --- a/devel/gflib/Makefile +++ b/devel/gflib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2008/03/03 17:45:35 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2008/04/07 17:14:20 joerg Exp $ # DISTNAME= gflib @@ -17,6 +17,8 @@ MAKE_FILE= makefile BUILD_TARGET= w16 +INSTALLATION_DIRS= bin + do-install: for f in gf_div gf_mult parity_test rs_decode_file \ rs_encode_file xor; do \ diff --git a/emulators/gnuboy-sdl/Makefile b/emulators/gnuboy-sdl/Makefile index ed9c467b7ab..fa8ad19932d 100644 --- a/emulators/gnuboy-sdl/Makefile +++ b/emulators/gnuboy-sdl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2008/03/03 19:21:38 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2008/04/07 17:17:00 joerg Exp $ DISTNAME= gnuboy-1.0.3 PKGNAME= ${DISTNAME:S/-/-sdl-/} @@ -15,11 +15,11 @@ PKG_DESTDIR_SUPPORT= user-destdir GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-sdl +INSTALLATION_DIRS= bin share/doc/gnuboy-sdl share/examples/gnuboy-sdl + .include "../../devel/SDL/buildlink3.mk" do-install: - ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/gnuboy-sdl - ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/gnuboy-sdl ${INSTALL_PROGRAM} ${WRKSRC}/sdlgnuboy \ ${DESTDIR}${PREFIX}/bin/gnuboy-sdl ${INSTALL_DATA} ${WRKSRC}/etc/sample.rc \ diff --git a/games/gogui/Makefile b/games/gogui/Makefile index 66173d1081a..96772926e6a 100644 --- a/games/gogui/Makefile +++ b/games/gogui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2008/03/04 11:02:24 rillig Exp $ +# $NetBSD: Makefile,v 1.7 2008/04/07 17:18:39 joerg Exp $ # DISTNAME= gogui-0.9.3 @@ -26,8 +26,7 @@ USE_TOOLS+= printf LIBDIR= ${PREFIX}/share/gogui/lib DOCDIR= ${PREFIX}/share/doc/gogui -MY_MANDIR= ${PREFIX}/${PKGMANDIR} -INSTALLATION_DIRS= bin ${LIBDIR} ${DOCDIR} ${MY_MANDIR} +INSTALLATION_DIRS= bin ${LIBDIR} ${DOCDIR} ${PKGMANDIR}/man1 do-build: .for p in gmptogtp gogui gtpadapter gtpdisplay gtpdummy gtpregress \ @@ -42,7 +41,7 @@ do-install: cd ${WRKSRC}/doc/manual/html && ${INSTALL_DATA} *.html *.png \ ${DESTDIR}${DOCDIR}/. cd ${WRKSRC}/doc/manual/man && ${INSTALL_MAN} *.1 \ - ${DESTDIR}${MY_MANDIR}/man1/. + ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/java-vm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/ifile-procmail/Makefile b/mail/ifile-procmail/Makefile index 8f7b949681f..4f44695613a 100644 --- a/mail/ifile-procmail/Makefile +++ b/mail/ifile-procmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2008/03/04 17:57:18 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2008/04/07 17:21:39 joerg Exp $ # DISTNAME= ifile.procmail-0.3 @@ -25,9 +25,9 @@ REPLACE_KSH+= bin/ifile.* NO_BUILD= YES +INSTALLATION_DIRS= bin share/doc/ifile share/examples/ifile + do-install: - ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/ifile - ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/ifile for f in `${LS} ${WRKSRC}/bin` ; do \ ${INSTALL_SCRIPT} ${WRKSRC}/bin/$$f ${DESTDIR}${PREFIX}/bin ; \ done diff --git a/multimedia/ggrab/Makefile b/multimedia/ggrab/Makefile index 95243b3242f..d447009ff9e 100644 --- a/multimedia/ggrab/Makefile +++ b/multimedia/ggrab/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2008/03/04 19:32:30 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2008/04/07 17:14:53 joerg Exp $ # DISTNAME= ${PKGNAME}-linux @@ -19,10 +19,11 @@ WRKSRC= ${WRKDIR}/ggrab-0.22a RCD_SCRIPTS= sserver DOCDIR= ${PREFIX}/share/doc/${PKGBASE} +INSTALLATION_DIRS= bin ${DOCDIR} + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ggrab ${DESTDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/sserver ${DESTDIR}${PREFIX}/bin - ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR} ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${DOCDIR}/ .include "../../mk/pthread.buildlink3.mk" -- cgit v1.2.3