summaryrefslogtreecommitdiff
path: root/sysutils/cdrdao
diff options
context:
space:
mode:
authordholland <dholland>2015-12-29 05:06:06 +0000
committerdholland <dholland>2015-12-29 05:06:06 +0000
commit7dee4d193327ec31bf7b0ba2ef8658335dcbc8de (patch)
tree1e7ee3ed7e64f81beee8ce21d0e0210972884b6b /sysutils/cdrdao
parentd0228fcc76df9047a70dda09f658306e865ae67c (diff)
downloadpkgsrc-7dee4d193327ec31bf7b0ba2ef8658335dcbc8de.tar.gz
pkglint.
Diffstat (limited to 'sysutils/cdrdao')
-rw-r--r--sysutils/cdrdao/Makefile9
-rw-r--r--sysutils/cdrdao/Makefile.common4
2 files changed, 6 insertions, 7 deletions
diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile
index 9d5619c027b..b209079e162 100644
--- a/sysutils/cdrdao/Makefile
+++ b/sysutils/cdrdao/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2012/10/23 19:50:54 asau Exp $
+# $NetBSD: Makefile,v 1.36 2015/12/29 05:06:06 dholland Exp $
.include "../../sysutils/cdrdao/Makefile.common"
@@ -14,18 +14,17 @@ CONFIGURE_ARGS+= --without-xdao
CONFIGURE_ARGS+= --without-posix-threads
.endif
+INSTALLATION_DIRS+= share/doc/cdrdao/testtocs \
+ share/examples/cdrdao/psxcopy
+
post-install:
- ${INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/share/doc/cdrdao
${INSTALL_MAN} ${WRKSRC}/README \
${WRKSRC}/README.PlexDAE \
${DESTDIR}${PREFIX}/share/doc/cdrdao
- ${INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/share/doc/cdrdao/testtocs
${INSTALL_MAN} ${WRKSRC}/testtocs/*.toc \
${DESTDIR}${PREFIX}/share/doc/cdrdao/testtocs
- ${INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/share/examples/cdrdao
${INSTALL_MAN} ${WRKSRC}/contrib/mp32dao/mp32dao.pl \
${DESTDIR}${PREFIX}/share/examples/cdrdao
- ${INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/share/examples/cdrdao/psxcopy
${INSTALL_MAN} ${WRKSRC}/contrib/psxcopy-0.2/Makefile \
${WRKSRC}/contrib/psxcopy-0.2/README \
${WRKSRC}/contrib/psxcopy-0.2/cdjob.c \
diff --git a/sysutils/cdrdao/Makefile.common b/sysutils/cdrdao/Makefile.common
index e1c86891fb3..4d63ec50e45 100644
--- a/sysutils/cdrdao/Makefile.common
+++ b/sysutils/cdrdao/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2014/10/09 14:06:57 wiz Exp $
+# $NetBSD: Makefile.common,v 1.13 2015/12/29 05:06:06 dholland Exp $
#
# used by sysutils/cdrdao/Makefile
# used by sysutils/gcdmaster/Makefile
@@ -43,7 +43,7 @@ post-extract:
${CP} ${WRKSRC}/scsilib/RULES/os-freebsd.id ${WRKSRC}/scsilib/RULES/os-dragonfly.id
post-configure:
- cd ${WRKSRC}/scsilib/RULES ; \
+ set -e; cd ${WRKSRC}/scsilib/RULES ; \
${TEST} -f netbsd-cc.rul || ${MV} i386-netbsd-cc.rul netbsd-cc.rul; \
${TEST} -f netbsd-gcc.rul || ${MV} i386-netbsd-gcc.rul netbsd-gcc.rul; \
${LN} -sf netbsd-gcc.rul ${MACHINE}-netbsd-gcc.rul; \