Fix DESTDIR.

10 files changed, 30 insertions, 16 deletions

diff --git a/audio/dap/Makefile b/audio/dap/Makefile
index 621eb388ccf..db10a92f34c 100644
--- a/audio/dap/Makefile
+++ b/audio/dap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2008/03/02 06:10:31 jlam Exp $
+# $NetBSD: Makefile,v 1.35 2008/04/07 16:54:53 joerg Exp $
 
 DISTNAME=	dap-2.1.5
 CATEGORIES=	audio
@@ -12,7 +12,7 @@ COMMENT=	Digital audio recording and processing package
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=		c c++
-INSTALLATION_DIRS+=	share/doc/dap
+INSTALLATION_DIRS+=	bin share/doc/dap
 MAKE_FILE=		Makefile.netbsd
 MAKE_ENV+=		X11PREFIX=${X11PREFIX:Q}
 
diff --git a/devel/device-driver-doc-de/Makefile b/devel/device-driver-doc-de/Makefile
index 0765951c62a..44d5b14d902 100644
--- a/devel/device-driver-doc-de/Makefile
+++ b/devel/device-driver-doc-de/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2008/03/03 17:45:34 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2008/04/07 16:57:42 joerg Exp $
 
 DISTNAME=	NetBSD-treiber_schreiben
 PKGNAME=	device-driver-doc-de-20030729
@@ -14,11 +14,12 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 NO_BUILD=	yes
 USE_TOOLS+=	gunzip
 
+INSTALLATION_DIRS=	share/device-driver-doc-de
+
 do-install:
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/device-driver-doc-de
 	${INSTALL_DATA} ${WRKSRC}/treiber_schreiben.pdf.gz ${DESTDIR}${PREFIX}/share/device-driver-doc-de
 	${GUNZIP_CMD} ${DESTDIR}${PREFIX}/share/device-driver-doc-de/treiber_schreiben.pdf.gz
-	${INSTALL_DATA} ${DESTDIR}${WRKSRC}/treiber_schreiben.ps.gz ${PREFIX}/share/device-driver-doc-de
+	${INSTALL_DATA} ${WRKSRC}/treiber_schreiben.ps.gz ${DESTDIR}${PREFIX}/share/device-driver-doc-de
 	${GUNZIP_CMD} ${DESTDIR}${PREFIX}/share/device-driver-doc-de/treiber_schreiben.ps.gz
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/distcc/Makefile.common b/devel/distcc/Makefile.common
index cd32ac21d45..c023d258a50 100644
--- a/devel/distcc/Makefile.common
+++ b/devel/distcc/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2006/09/04 08:56:09 martti Exp $
+# $NetBSD: Makefile.common,v 1.6 2008/04/07 16:58:50 joerg Exp $
 #
 
 ### XXX: See the other 'XXX' comment below when updating this package.
@@ -35,4 +35,6 @@ PRINT_PLIST_AWK+=	/^@dirrm share\/distcc$$/ \
 				{ print "@comment in distcc: " $$0; next }
 .endif
 
+INSTALLATION_DIRS+=	bin
+
 .include "../../devel/popt/buildlink3.mk"
diff --git a/emulators/dynamips/Makefile b/emulators/dynamips/Makefile
index 4c5517b32d5..91248b4caa5 100644
--- a/emulators/dynamips/Makefile
+++ b/emulators/dynamips/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/03/03 19:21:38 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2008/04/07 17:00:14 joerg Exp $
 
 DISTNAME=	dynamips-0.2.7
 CATEGORIES=	emulators
@@ -22,6 +22,8 @@ SUBST_FILES.libelf=	dynamips.h rom2c.c
 SUBST_SED.libelf=	-e 's,<libelf.h>,<libelf/libelf.h>,'
 SUBST_MESSAGE.libelf=	Fix libelf header file path
 
+INSTALLATION_DIRS=	bin
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/dynamips ${DESTDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/nvram_export ${DESTDIR}${PREFIX}/bin
diff --git a/fonts/cyr-rfx-share/Makefile.common b/fonts/cyr-rfx-share/Makefile.common
index 67f700ae610..c249b794d0b 100644
--- a/fonts/cyr-rfx-share/Makefile.common
+++ b/fonts/cyr-rfx-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2008/03/03 20:17:11 jlam Exp $
+# $NetBSD: Makefile.common,v 1.11 2008/04/07 16:54:26 joerg Exp $
 
 DISTNAME=	cyr-rfx-${CYR_RFX_ENCODING}-1.1
 CATEGORIES=	fonts x11
@@ -27,6 +27,8 @@ REQD_DIRS+=		${PREFIX}/lib/X11/fonts/local/${CYR_RFX_ENCODING}
 REQD_DIRS+=		${PREFIX}/lib/X11/fonts/local/${CYR_RFX_ENCODING}/75dpi
 REQD_DIRS+=		${PREFIX}/lib/X11/fonts/local/${CYR_RFX_ENCODING}/misc
 
+INSTALLATION_DIRS=	lib/X11/fonts/local
+
 do-install:
 	cd ${DESTDIR}${PREFIX}/lib/X11/fonts/local && \
 	${GTAR} xzf ${_DISTDIR}/${DISTFILES} \
diff --git a/games/crossfire-maps/Makefile b/games/crossfire-maps/Makefile
index 9321f4d27ab..41faa858c89 100644
--- a/games/crossfire-maps/Makefile
+++ b/games/crossfire-maps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/08/30 19:55:30 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/04/07 16:53:38 joerg Exp $
 
 DISTNAME=	crossfire-1.9.0-1.maps
 PKGNAME=	crossfire-maps-1.9.0.1
@@ -26,6 +26,8 @@ REPLACE_BASH+=	brest/pshops/pshop_copier
 REPLACE_PERL+=	Info/combine.pl Info/map_sed.pl Info/rewrite_exits.pl
 REPLACE_PERL+=	Info/rewrite_styles.pl Info/update_apart.pl Info/update_exits.pl
 
+INSTALLATION_DIRS=	share/crossfire/maps
+
 do-install:
 	cd ${WRKDIR} && ${CP} -R maps ${DESTDIR}${PREFIX}/share/crossfire
 	cd ${DESTDIR}${PREFIX} && \
diff --git a/games/fltk-sudoku/Makefile b/games/fltk-sudoku/Makefile
index 406dbf9016a..7c7c0d0ee13 100644
--- a/games/fltk-sudoku/Makefile
+++ b/games/fltk-sudoku/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/03/04 06:59:04 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2008/04/07 17:08:44 joerg Exp $
 
 DISTNAME=	fltk-1.1.7-source
 PKGNAME=	fltk-sudoku-1.1.7
@@ -45,6 +45,8 @@ SUBST_SED.config2=	-e "s|../lib/||g"
 BUILD_DIRS=		test
 BUILD_TARGET=		sudoku
 
+INSTALLATION_DIRS=	bin
+
 SETGIDGAME=		yes
 SPECIAL_PERMS=		bin/fltk-sudoku ${SETGID_GAMES_PERMS}
 
diff --git a/ham/fl_logbook/Makefile b/ham/fl_logbook/Makefile
index 253422c768d..e94b49a92aa 100644
--- a/ham/fl_logbook/Makefile
+++ b/ham/fl_logbook/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/03/04 15:51:59 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2008/04/07 17:08:11 joerg Exp $
 #
 
 DISTNAME=		fl_logbook.121.src
@@ -21,6 +21,8 @@ MAKE_ENV+=		CFG=Release
 
 BUILD_TARGET=		#defined in dist Makefile
 
+INSTALLATION_DIRS=	bin
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/Release/fl_logbook ${DESTDIR}${PREFIX}/bin
 
diff --git a/mail/fetchyahoo/Makefile b/mail/fetchyahoo/Makefile
index c3a82407fb1..eaacbd3dd88 100644
--- a/mail/fetchyahoo/Makefile
+++ b/mail/fetchyahoo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/03/04 17:57:18 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2008/04/07 17:07:45 joerg Exp $
 #
 
 DISTNAME=		fetchyahoo-2.11.0
@@ -40,11 +40,12 @@ SUBST_FILES.sa2=	fetchyahoo fetchyahoo.1 INSTALL
 SUBST_SED.sa2=		-e s!/etc/fetchyahoorc!${PKG_SYSCONFDIR}/fetchyahoorc!g
 SUBST_SED.sa2+=		-e s!/usr/share/doc/fetchyahoo!${DOCDIR}!g
 
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/doc/fetchyahoo \
+			share/examples/fetchyahoo
+
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/fetchyahoo ${DESTDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/fetchyahoo.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
-	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
 .for i in COPYING ChangeLog Credits INSTALL TODO index.html
 	${INSTALL_DATA} ${WRKSRC}/${i} ${DESTDIR}${PREFIX}/share/doc/fetchyahoo
 .endfor
diff --git a/multimedia/dvdbackup/Makefile b/multimedia/dvdbackup/Makefile
index 7a3ab563b9d..40943ec5ba4 100644
--- a/multimedia/dvdbackup/Makefile
+++ b/multimedia/dvdbackup/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 16:59:48 joerg Exp $
 
 DISTNAME=	dvdbackup-0.1.1
 PKGREVISION=	4
@@ -13,7 +13,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=		${WRKDIR}/dvdbackup/src
 
-INSTALLATION_DIRS=	bin
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-build:
 	cd ${WRKSRC}; \