From 3ab931d7e7ba2b1af375fc1f1fd56d9abe2c359d Mon Sep 17 00:00:00 2001 From: gerald Date: Sun, 29 Feb 2004 22:45:09 +0000 Subject: Fix the NOPORTDOCS case for installation and packaging. Use DOCSDIR. Submitted by: Piotr Smyrak --- emulators/wine-devel/Makefile | 10 ++++------ emulators/wine-devel/pkg-plist | 16 ++++++++-------- emulators/wine/Makefile | 10 ++++------ emulators/wine/pkg-plist | 16 ++++++++-------- 4 files changed, 24 insertions(+), 28 deletions(-) (limited to 'emulators') diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index 6b1256b54a6b..d10cfb311bc7 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -63,16 +63,14 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/documentation/wine.man ${PREFIX}/man/man1/wine.1 ${INSTALL_MAN} ${WRKSRC}/documentation/wine.conf.man ${PREFIX}/man/man5/wine.conf.5 .if !defined(NOPORTDOCS) - -@${MKDIR} ${PREFIX}/share/doc/${PORTNAME} + -@${MKDIR} ${DOCSDIR} .for i in README ANNOUNCE AUTHORS LICENSE - @${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/${PORTNAME} + @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} .endfor .for i in wcmd winedbg - ${INSTALL_DATA} ${WRKSRC}/programs/${i}/README \ - ${PREFIX}/share/doc/${PORTNAME}/README.${i} + ${INSTALL_DATA} ${WRKSRC}/programs/${i}/README ${DOCSDIR}/README.${i} .endfor - ${INSTALL_DATA} ${WRKSRC}/tools/winedump/README \ - ${PREFIX}/share/doc/${PORTNAME}/README.winedump + ${INSTALL_DATA} ${WRKSRC}/tools/winedump/README ${DOCSDIR}/README.winedump .endif ${INSTALL_SCRIPT} ${WRKSRC}/tools/bug_report.pl ${PREFIX}/lib/wine ${INSTALL_DATA} ${WRKSRC}/winedefault.reg ${PREFIX}/lib/wine diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist index c7766beb03df..f029e3193f77 100644 --- a/emulators/wine-devel/pkg-plist +++ b/emulators/wine-devel/pkg-plist @@ -611,14 +611,14 @@ lib/wine/ws2_32.dll.so lib/wine/wsock32.dll.so lib/wine/x11drv.dll.so share/aclocal/wine.m4 -%%DOCSDIR%%/ANNOUNCE -%%DOCSDIR%%/AUTHORS -%%DOCSDIR%%/LICENSE -%%DOCSDIR%%/README -%%DOCSDIR%%/README.wcmd -%%DOCSDIR%%/README.winedbg -%%DOCSDIR%%/README.winedump -%%PORTDOCS%%@dirrm share/doc/wine +%%PORTDOCS%%%%DOCSDIR%%/ANNOUNCE +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/LICENSE +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/README.wcmd +%%PORTDOCS%%%%DOCSDIR%%/README.winedbg +%%PORTDOCS%%%%DOCSDIR%%/README.winedump +%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm lib/wine @dirrm include/wine/msvcrt/sys @dirrm include/wine/msvcrt diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index 6b1256b54a6b..d10cfb311bc7 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -63,16 +63,14 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/documentation/wine.man ${PREFIX}/man/man1/wine.1 ${INSTALL_MAN} ${WRKSRC}/documentation/wine.conf.man ${PREFIX}/man/man5/wine.conf.5 .if !defined(NOPORTDOCS) - -@${MKDIR} ${PREFIX}/share/doc/${PORTNAME} + -@${MKDIR} ${DOCSDIR} .for i in README ANNOUNCE AUTHORS LICENSE - @${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/${PORTNAME} + @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} .endfor .for i in wcmd winedbg - ${INSTALL_DATA} ${WRKSRC}/programs/${i}/README \ - ${PREFIX}/share/doc/${PORTNAME}/README.${i} + ${INSTALL_DATA} ${WRKSRC}/programs/${i}/README ${DOCSDIR}/README.${i} .endfor - ${INSTALL_DATA} ${WRKSRC}/tools/winedump/README \ - ${PREFIX}/share/doc/${PORTNAME}/README.winedump + ${INSTALL_DATA} ${WRKSRC}/tools/winedump/README ${DOCSDIR}/README.winedump .endif ${INSTALL_SCRIPT} ${WRKSRC}/tools/bug_report.pl ${PREFIX}/lib/wine ${INSTALL_DATA} ${WRKSRC}/winedefault.reg ${PREFIX}/lib/wine diff --git a/emulators/wine/pkg-plist b/emulators/wine/pkg-plist index c7766beb03df..f029e3193f77 100644 --- a/emulators/wine/pkg-plist +++ b/emulators/wine/pkg-plist @@ -611,14 +611,14 @@ lib/wine/ws2_32.dll.so lib/wine/wsock32.dll.so lib/wine/x11drv.dll.so share/aclocal/wine.m4 -%%DOCSDIR%%/ANNOUNCE -%%DOCSDIR%%/AUTHORS -%%DOCSDIR%%/LICENSE -%%DOCSDIR%%/README -%%DOCSDIR%%/README.wcmd -%%DOCSDIR%%/README.winedbg -%%DOCSDIR%%/README.winedump -%%PORTDOCS%%@dirrm share/doc/wine +%%PORTDOCS%%%%DOCSDIR%%/ANNOUNCE +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/LICENSE +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/README.wcmd +%%PORTDOCS%%%%DOCSDIR%%/README.winedbg +%%PORTDOCS%%%%DOCSDIR%%/README.winedump +%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm lib/wine @dirrm include/wine/msvcrt/sys @dirrm include/wine/msvcrt -- cgit