diff options
| author | Alexander Leidinger <netchild@FreeBSD.org> | 2004-05-25 14:26:39 +0000 |
|---|---|---|
| committer | Alexander Leidinger <netchild@FreeBSD.org> | 2004-05-25 14:26:39 +0000 |
| commit | 6c5bd8f212d333ef60b71bcd16c3e5bc8f4ca480 (patch) | |
| tree | 84f6797bbca6a7043a88a557d0227cb566141a2c /sysutils/cdrtools | |
| parent | aef9c04ecf342279741b12a5164dff3752d08265 (diff) | |
| download | ports-6c5bd8f212d333ef60b71bcd16c3e5bc8f4ca480.tar.gz ports-6c5bd8f212d333ef60b71bcd16c3e5bc8f4ca480.zip | |
- Fix installation when CC is not set to "cc". [1]
- Use ARCH instead of MACHINE_ARCH to please portlint >= 2.5.9.
PR: 66925 [1]
Submitted by: marius
Notes
Notes:
svn path=/head/; revision=109977
Diffstat (limited to 'sysutils/cdrtools')
| -rw-r--r-- | sysutils/cdrtools/Makefile | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/sysutils/cdrtools/Makefile b/sysutils/cdrtools/Makefile index 9e8cce33de0b..d85d5973bfa1 100644 --- a/sysutils/cdrtools/Makefile +++ b/sysutils/cdrtools/Makefile @@ -40,6 +40,7 @@ USE_GMAKE= yes USE_REINPLACE= yes MAKE_ENV= CCOM=${CC} LANG=C #CFLAGS+= -DSOURCE_MODIFIED +CDRTLSTARGET= ${ARCH}-freebsd-${CC} .if defined(MKISOFS) DOCSSRC= ${WRKSRC}/${PORTNAME} @@ -76,9 +77,9 @@ post-extract: @${CP} ${PORTSDIR}/Templates/${i} ${WRKSRC}/conf @${CP} ${PORTSDIR}/Templates/${i} ${WRKSRC}/cdda2wav .endfor -.if ${MACHINE_ARCH} != "i386" || ${CC} != "cc" +.if ${ARCH} != "i386" || ${CC} != "cc" @${LN} -sf ${WRKSRC}/RULES/i386-freebsd-cc.rul \ - ${WRKSRC}/RULES/${MACHINE_ARCH}-freebsd-${CC}.rul + ${WRKSRC}/RULES/${CDRTLSTARGET}.rul .endif post-patch: @@ -111,29 +112,29 @@ post-patch: do-install: .if defined(MKISOFS) - @${INSTALL_PROGRAM} ${WRKSRC}/mkisofs/OBJ/${ARCH}-freebsd-cc/mkisofs \ + @${INSTALL_PROGRAM} ${WRKSRC}/mkisofs/OBJ/${CDRTLSTARGET}/mkisofs \ ${PREFIX}/bin @${LN} -sf mkisofs ${PREFIX}/bin/mkhybrid .for i in devdump isodebug isodump isoinfo isovfy - @${INSTALL_PROGRAM} ${WRKSRC}/mkisofs/diag/OBJ/${ARCH}-freebsd-cc/${i} \ + @${INSTALL_PROGRAM} ${WRKSRC}/mkisofs/diag/OBJ/${CDRTLSTARGET}/${i} \ ${PREFIX}/bin .endfor @${INSTALL_MAN} ${WRKSRC}/mkisofs/mkisofs.8 ${PREFIX}/man/man8 @${INSTALL_MAN} ${WRKSRC}/mkisofs/diag/isoinfo.8 ${PREFIX}/man/man8 .else - @${INSTALL_PROGRAM} ${WRKSRC}/cdda2wav/OBJ/${ARCH}-freebsd-cc/cdda2wav \ + @${INSTALL_PROGRAM} ${WRKSRC}/cdda2wav/OBJ/${CDRTLSTARGET}/cdda2wav \ ${PREFIX}/bin @${LN} -sf cdda2wav ${PREFIX}/bin/list_audio_tracks - @${INSTALL_PROGRAM} ${WRKSRC}/cdrecord/OBJ/${ARCH}-freebsd-cc/cdrecord \ + @${INSTALL_PROGRAM} ${WRKSRC}/cdrecord/OBJ/${CDRTLSTARGET}/cdrecord \ ${PREFIX}/bin - @${INSTALL_PROGRAM} ${WRKSRC}/readcd/OBJ/${ARCH}-freebsd-cc/readcd \ + @${INSTALL_PROGRAM} ${WRKSRC}/readcd/OBJ/${CDRTLSTARGET}/readcd \ ${PREFIX}/bin .if defined(WITH_RSCSI) - @${INSTALL_PROGRAM} ${WRKSRC}/rscsi/OBJ/${ARCH}-freebsd-cc/rscsi \ + @${INSTALL_PROGRAM} ${WRKSRC}/rscsi/OBJ/${CDRTLSTARGET}/rscsi \ ${PREFIX}/sbin @${CHMOD} u+s ${PREFIX}/sbin/rscsi .endif - @${INSTALL_PROGRAM} ${WRKSRC}/scgcheck/OBJ/${ARCH}-freebsd-cc/scgcheck \ + @${INSTALL_PROGRAM} ${WRKSRC}/scgcheck/OBJ/${CDRTLSTARGET}/scgcheck \ ${PREFIX}/bin @${INSTALL_MAN} ${WRKSRC}/cdda2wav/cdda2wav.1 ${PREFIX}/man/man1 @${INSTALL_MAN} ${WRKSRC}/cdrecord/cdrecord.1 ${PREFIX}/man/man1 |