Fix DESTDIR.

5 files changed, 19 insertions, 24 deletions

diff --git a/devel/refinecvs/Makefile b/devel/refinecvs/Makefile
index da60510beab..7eb3c581b28 100644
--- a/devel/refinecvs/Makefile
+++ b/devel/refinecvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/03/03 17:45:37 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2008/04/07 17:55:16 joerg Exp $
 #
 
 DISTNAME=		refinecvs-0.86.1251
@@ -19,13 +19,13 @@ REPLACE_PERL=	refinecvs.pl
 
 LIBDIR=	${PREFIX}/${PERL5_SUB_INSTALLARCHLIB}/Cvs/Repository
 
+INSTALLATION_DIRS=	bin ${LIBDIR} share/doc/refinecvs
+
 do-install:
-	${INSTALL_LIB_DIR} ${DESTDIR}${LIBDIR}
 	for f in DeltaCache.pm Delta.pm Exception.pm File.pm Reader.pm Revision.pm ; do \
 		${INSTALL_DATA} ${WRKSRC}/Cvs/Repository/$$f ${DESTDIR}${LIBDIR}/$$f; \
 	done
 	${INSTALL_SCRIPT} ${WRKSRC}/refinecvs.pl ${DESTDIR}${PREFIX}/bin/refinecvs
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/refinecvs
 	for f in Changes LICENSE README TODO ; do \
 		${INSTALL_DATA} ${WRKSRC}/$$f ${DESTDIR}${PREFIX}/share/doc/refinecvs/$$f; \
 	done
diff --git a/editors/pico/Makefile b/editors/pico/Makefile
index c2dacf21dc9..958058d1d87 100644
--- a/editors/pico/Makefile
+++ b/editors/pico/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2008/03/05 19:02:13 jlam Exp $
+# $NetBSD: Makefile,v 1.74 2008/04/07 17:52:07 joerg Exp $
 #
 # NOTE:
 # When updating, it is necessary to change the shlib version, located in
@@ -46,7 +46,7 @@ LIBS+=			${BUILDLINK_LDADD.termcap}
 
 MAKE_ENV+=	_STRIPFLAG_INSTALL=	# debug...
 
-INSTALLATION_DIRS=	bin lib ${PKGMANDIR}/man1
+INSTALLATION_DIRS=	bin include/pico lib ${PKGMANDIR}/man1
 
 # Create the OS-dependent files for Interix from the Solaris ones.
 post-extract:
@@ -69,7 +69,6 @@ do-install:
 		${WRKSRC}/pico/pico ${WRKSRC}/pico/pilot ${DESTDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/doc/pico.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_MAN} ${WRKSRC}/doc/pilot.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_DATA_DIR} ${PREFIX}/include/pico
 	cd ${WRKSRC}/pico && ${INSTALL_DATA} *.h ${DESTDIR}${PREFIX}/include/pico
 
 .include "../../mk/termcap.buildlink3.mk"
diff --git a/games/quake3arena-demo/Makefile b/games/quake3arena-demo/Makefile
index 4d5bb8add84..beb49613980 100644
--- a/games/quake3arena-demo/Makefile
+++ b/games/quake3arena-demo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2008/03/04 06:59:05 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2008/04/07 17:54:03 joerg Exp $
 
 DISTNAME=	linuxq3ademo-1_11-6_x86_gz
 PKGREVISION=	3
@@ -31,7 +31,7 @@ WRKSRC=		${WRKDIR}
 LIBDIR=		${PREFIX}/lib/lokigames/${BINNAME}
 SHAREDIR=	${PREFIX}/share/doc/lokigames
 
-INSTALLATION_DIRS=	bin
+INSTALLATION_DIRS=	bin ${LIBDIR} ${SHAREDIR}
 
 do-build:
 	${SED} -e 's#@@PREFIX@@#${PREFIX}#g' \
@@ -41,8 +41,6 @@ do-build:
 
 # The executable must be in the same directory as the data.
 do-install:
-	${INSTALL_PROGRAM_DIR} ${DESTDIR}${LIBDIR}
-	${INSTALL_DATA_DIR} ${DESTDIR}${SHAREDIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/${BINNAME}.sh ${DESTDIR}${PREFIX}/bin/${BINNAME}
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/x86/glibc-2.1/${DISTBINNAME} \
 		${DESTDIR}${LIBDIR}/${BINNAME}
@@ -55,6 +53,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${SHAREDIR}/${BINNAME}-README
 	cd ${WRKSRC} && ${PAX} -rw demoq3 icon.bmp icon.xpm ${DESTDIR}${LIBDIR}
 	cd ${WRKSRC} && ${PAX} -rw Help ${DESTDIR}${SHAREDIR}
-	${MV} ${SHAREDIR}/Help ${DESTDIR}${SHAREDIR}/quake3arena-Help
+	${MV} ${DESTDIR}${SHAREDIR}/Help ${DESTDIR}${SHAREDIR}/quake3arena-Help
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/rocksndiamonds-levels/Makefile b/games/rocksndiamonds-levels/Makefile
index 78691ec3330..6f2ac62be6f 100644
--- a/games/rocksndiamonds-levels/Makefile
+++ b/games/rocksndiamonds-levels/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2008/03/04 06:59:05 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2008/04/07 17:56:24 joerg Exp $
 
 DISTNAME=	rocksndiamonds-levels-1.0
 PKGREVISION=	3
@@ -21,6 +21,8 @@ NO_BUILD=	yes
 USE_LANGUAGES=	# none
 WRKSRC=		${WRKDIR}/levels
 
+INSTALLATION_DIRS=	share/rocksndiamonds/levels
+
 PLIST_SRC=	${WRKDIR}/PLIST ${PKGDIR}/PLIST
 
 # if you change SCORE_PATH, don't forget to change patch-aa, too
diff --git a/lang/sather/Makefile b/lang/sather/Makefile
index 0f43874663f..9642e3a9770 100644
--- a/lang/sather/Makefile
+++ b/lang/sather/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2008/03/04 16:38:13 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2008/04/07 17:58:55 joerg Exp $
 
 DISTNAME=		sather-1.2.1
 PKGREVISION=		7
@@ -48,7 +48,8 @@ SUBST_SED.sather-configure=					\
 	-e 's:@LINKER_RPATH_FLAG@:${LINKER_RPATH_FLAG}:g'	\
 	-e 's:@COMPILER_RPATH_FLAG@:${COMPILER_RPATH_FLAG}:g'
 
-INSTALLATION_DIRS=	${PKGMANDIR}/man1
+INSTALLATION_DIRS=	bin ${PKGINFODIR} ${PKGMANDIR}/man1 lib/sather \
+			share/doc/sather share/emacs/site-lisp
 
 post-patch:
 	ln -s netbsd ${WRKSRC}/System/Platforms/dragonfly
@@ -61,18 +62,15 @@ post-build:
 	${RM} -fr ${WRKSRC}/System/Platforms/dualgui/dual_gui_server.code
 
 do-install:
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/sather
 	${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/lib/sather/Bin
-	cd ${WRKSRC}/Bin;						\
-	${INSTALL_PROGRAM} sacomp sabrowse				\
-		${DESTDIR}${PREFIX}/lib/sather/Bin;			\
-	${INSTALL_SCRIPT} PP gen_html saprep				\
+	${INSTALL_PROGRAM} ${WRKSRC}/Bin/sacomp ${WRKSRC}/Bin/sabrowse	\
 		${DESTDIR}${PREFIX}/lib/sather/Bin
+	${INSTALL_SCRIPT} ${WRKSRC}/Bin/PP ${WRKSRC}/Bin/gen_html	\
+		${WRKSRC}/Bin/saprep ${DESTDIR}${PREFIX}/lib/sather/Bin
 	${INSTALL_SCRIPT} ${WRKSRC}/debian/bin-wrapper			\
 		${DESTDIR}${PREFIX}/lib/sather/Bin
-	cd ${DESTDIR}${PREFIX}/bin;					\
-		 ${LN} -sf ../lib/sather/Bin/bin-wrapper sacomp;	\
-		 ${LN} -sf ../lib/sather/Bin/bin-wrapper sabrowse;	\
+	 ${LN} -sf ../lib/sather/Bin/bin-wrapper ${DESTDIR}${PREFIX}/bin/sacomp
+	 ${LN} -sf ../lib/sather/Bin/bin-wrapper ${DESTDIR}${PREFIX}/bin/sabrowse
 	cd ${WRKSRC} && ${PAX} -s ',.*\.sav,,' -rw Library		\
 		System/FORBID						\
 		System/Debug						\
@@ -89,14 +87,12 @@ do-install:
 		${TEST} ! -f "$$f" ||					\
 		${INSTALL_DATA} "$$f" ${DESTDIR}${PREFIX}/${PKGINFODIR};\
 	done
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/sather
 	cd ${WRKSRC}/Doc && ${PAX} -rw -s ',.*/man.*,,' .		\
 		${DESTDIR}${PREFIX}/share/doc/sather
 	${INSTALL_MAN} ${WRKSRC}/Doc/man/man1/sacomp.1			\
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_MAN} ${WRKSRC}/Doc/man/man1/sabrowse.1		\
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/emacs/site-lisp
 	${INSTALL_DATA} ${WRKSRC}/Emacs/*.el				\
 		${DESTDIR}${PREFIX}/share/emacs/site-lisp