From 71ca8f912fe63e1f0430d26c98142970633113c1 Mon Sep 17 00:00:00 2001 From: fredb Date: Mon, 18 Mar 2002 07:58:35 +0000 Subject: [PATCH] The host specific installation subdirectories are actually taken by configure from its --host argument, which is exactly ${MACHINE_GNU_PLATFORM}. Use that for the PLIST instead of ${MACHINE_ARCH}--${LOWER_OPSYS}, which may lack the "elf" suffix on certain platforms. --- lang/mercury/Makefile | 6 +-- lang/mercury/PLIST | 102 +++++++++++++++++++++--------------------- math/octave/PLIST | 20 ++++----- 3 files changed, 64 insertions(+), 64 deletions(-) diff --git a/lang/mercury/Makefile b/lang/mercury/Makefile index 5922b4e78335..9ae572d45847 100644 --- a/lang/mercury/Makefile +++ b/lang/mercury/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2002/02/18 15:14:26 seb Exp $ +# $NetBSD: Makefile,v 1.6 2002/03/18 07:58:35 fredb Exp $ DISTNAME= mercury-compiler-0.10.1 PKGNAME= mercury-0.10.1 @@ -25,9 +25,9 @@ CONFIGURE_ENV+= BOEHM_GC_DIR=${BOEHM_GC_DIR} CONFIGURE_ENV+= CC=gcc post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/lib/mercury/lib/${MACHINE_ARCH}--${LOWER_OPSYS} + ${INSTALL_DATA_DIR} ${PREFIX}/lib/mercury/lib/${MACHINE_GNU_PLATFORM} ${LN} -sf ${PREFIX}/lib/libgc.a \ - ${PREFIX}/lib/mercury/lib/${MACHINE_ARCH}--${LOWER_OPSYS}/libgc.a + ${PREFIX}/lib/mercury/lib/${MACHINE_GNU_PLATFORM}/libgc.a ${LN} -sf ${PREFIX}/include/gc.h ${PREFIX}/lib/mercury/inc/gc.h ${FIND} ${WRKSRC} -type d -name "CVS" | ${XARGS} ${RM} -fr ${FIND} ${WRKSRC} -type f -name ".cvsignore" | ${XARGS} ${RM} -f diff --git a/lang/mercury/PLIST b/lang/mercury/PLIST index f0ce13be152e..67682c75d997 100644 --- a/lang/mercury/PLIST +++ b/lang/mercury/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:26 seb Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/03/18 07:58:35 fredb Exp $ bin/c2init bin/canonical_grade bin/info_to_mdb @@ -47,8 +47,8 @@ info/mercury_user_guide.info-2 info/mercury_user_guide.info-3 info/mercury_user_guide.info-4 @exec ${INSTALL_INFO} --info-dir=%D/info %D/info/mercury.info -lib/mercury/bin/${MACHINE_ARCH}--${LOWER_OPSYS}/mercury_compile -lib/mercury/bin/${MACHINE_ARCH}--${LOWER_OPSYS}/mercury_profile +lib/mercury/bin/${MACHINE_GNU_PLATFORM}/mercury_compile +lib/mercury/bin/${MACHINE_GNU_PLATFORM}/mercury_profile lib/mercury/inc/gc.h lib/mercury/inc/machdeps/i386_regs.h lib/mercury/inc/machdeps/alpha_regs.h @@ -545,43 +545,43 @@ lib/mercury/ints/varset.int2 lib/mercury/ints/varset.int3 lib/mercury/ints/varset.opt lib/mercury/ints/varset.trans_opt -lib/mercury/lib/${MACHINE_ARCH}--${LOWER_OPSYS}/libgc.a -lib/mercury/lib/asm_fast.gc.memprof/${MACHINE_ARCH}--${LOWER_OPSYS}/libmer_browser.a -lib/mercury/lib/asm_fast.gc.memprof/${MACHINE_ARCH}--${LOWER_OPSYS}/libmer_rt.a -lib/mercury/lib/asm_fast.gc.memprof/${MACHINE_ARCH}--${LOWER_OPSYS}/libmer_std.a -lib/mercury/lib/asm_fast.gc.memprof/${MACHINE_ARCH}--${LOWER_OPSYS}/libmer_trace.a -lib/mercury/lib/asm_fast.gc.prof/${MACHINE_ARCH}--${LOWER_OPSYS}/libmer_browser.a -lib/mercury/lib/asm_fast.gc.prof/${MACHINE_ARCH}--${LOWER_OPSYS}/libmer_rt.a -lib/mercury/lib/asm_fast.gc.prof/${MACHINE_ARCH}--${LOWER_OPSYS}/libmer_std.a -lib/mercury/lib/asm_fast.gc.prof/${MACHINE_ARCH}--${LOWER_OPSYS}/libmer_trace.a -lib/mercury/lib/asm_fast.gc.tr.debug/${MACHINE_ARCH}--${LOWER_OPSYS}/libmer_browser.a -lib/mercury/lib/asm_fast.gc.tr.debug/${MACHINE_ARCH}--${LOWER_OPSYS}/libmer_rt.a -lib/mercury/lib/asm_fast.gc.tr.debug/${MACHINE_ARCH}--${LOWER_OPSYS}/libmer_std.a -lib/mercury/lib/asm_fast.gc.tr.debug/${MACHINE_ARCH}--${LOWER_OPSYS}/libmer_trace.a -lib/mercury/lib/asm_fast.gc.tr/${MACHINE_ARCH}--${LOWER_OPSYS}/libmer_browser.a -lib/mercury/lib/asm_fast.gc.tr/${MACHINE_ARCH}--${LOWER_OPSYS}/libmer_rt.a -lib/mercury/lib/asm_fast.gc.tr/${MACHINE_ARCH}--${LOWER_OPSYS}/libmer_std.a -lib/mercury/lib/asm_fast.gc.tr/${MACHINE_ARCH}--${LOWER_OPSYS}/libmer_trace.a -lib/mercury/lib/asm_fast.gc/${MACHINE_ARCH}--${LOWER_OPSYS}/libmer_browser.a -lib/mercury/lib/asm_fast.gc/${MACHINE_ARCH}--${LOWER_OPSYS}/libmer_rt.a -lib/mercury/lib/asm_fast.gc/${MACHINE_ARCH}--${LOWER_OPSYS}/libmer_std.a -lib/mercury/lib/asm_fast.gc/${MACHINE_ARCH}--${LOWER_OPSYS}/libmer_trace.a -lib/mercury/lib/asm_fast.prof/${MACHINE_ARCH}--${LOWER_OPSYS}/libmer_browser.a -lib/mercury/lib/asm_fast.prof/${MACHINE_ARCH}--${LOWER_OPSYS}/libmer_rt.a -lib/mercury/lib/asm_fast.prof/${MACHINE_ARCH}--${LOWER_OPSYS}/libmer_std.a -lib/mercury/lib/asm_fast.prof/${MACHINE_ARCH}--${LOWER_OPSYS}/libmer_trace.a -lib/mercury/lib/asm_fast/${MACHINE_ARCH}--${LOWER_OPSYS}/libmer_browser.a -lib/mercury/lib/asm_fast/${MACHINE_ARCH}--${LOWER_OPSYS}/libmer_rt.a -lib/mercury/lib/asm_fast/${MACHINE_ARCH}--${LOWER_OPSYS}/libmer_std.a -lib/mercury/lib/asm_fast/${MACHINE_ARCH}--${LOWER_OPSYS}/libmer_trace.a -lib/mercury/lib/hlc.gc/${MACHINE_ARCH}--${LOWER_OPSYS}/libmer_browser.a -lib/mercury/lib/hlc.gc/${MACHINE_ARCH}--${LOWER_OPSYS}/libmer_rt.a -lib/mercury/lib/hlc.gc/${MACHINE_ARCH}--${LOWER_OPSYS}/libmer_std.a -lib/mercury/lib/hlc.gc/${MACHINE_ARCH}--${LOWER_OPSYS}/libmer_trace.a -lib/mercury/lib/hlc.par.gc/${MACHINE_ARCH}--${LOWER_OPSYS}/libmer_browser.a -lib/mercury/lib/hlc.par.gc/${MACHINE_ARCH}--${LOWER_OPSYS}/libmer_rt.a -lib/mercury/lib/hlc.par.gc/${MACHINE_ARCH}--${LOWER_OPSYS}/libmer_std.a -lib/mercury/lib/hlc.par.gc/${MACHINE_ARCH}--${LOWER_OPSYS}/libmer_trace.a +lib/mercury/lib/${MACHINE_GNU_PLATFORM}/libgc.a +lib/mercury/lib/asm_fast.gc.memprof/${MACHINE_GNU_PLATFORM}/libmer_browser.a +lib/mercury/lib/asm_fast.gc.memprof/${MACHINE_GNU_PLATFORM}/libmer_rt.a +lib/mercury/lib/asm_fast.gc.memprof/${MACHINE_GNU_PLATFORM}/libmer_std.a +lib/mercury/lib/asm_fast.gc.memprof/${MACHINE_GNU_PLATFORM}/libmer_trace.a +lib/mercury/lib/asm_fast.gc.prof/${MACHINE_GNU_PLATFORM}/libmer_browser.a +lib/mercury/lib/asm_fast.gc.prof/${MACHINE_GNU_PLATFORM}/libmer_rt.a +lib/mercury/lib/asm_fast.gc.prof/${MACHINE_GNU_PLATFORM}/libmer_std.a +lib/mercury/lib/asm_fast.gc.prof/${MACHINE_GNU_PLATFORM}/libmer_trace.a +lib/mercury/lib/asm_fast.gc.tr.debug/${MACHINE_GNU_PLATFORM}/libmer_browser.a +lib/mercury/lib/asm_fast.gc.tr.debug/${MACHINE_GNU_PLATFORM}/libmer_rt.a +lib/mercury/lib/asm_fast.gc.tr.debug/${MACHINE_GNU_PLATFORM}/libmer_std.a +lib/mercury/lib/asm_fast.gc.tr.debug/${MACHINE_GNU_PLATFORM}/libmer_trace.a +lib/mercury/lib/asm_fast.gc.tr/${MACHINE_GNU_PLATFORM}/libmer_browser.a +lib/mercury/lib/asm_fast.gc.tr/${MACHINE_GNU_PLATFORM}/libmer_rt.a +lib/mercury/lib/asm_fast.gc.tr/${MACHINE_GNU_PLATFORM}/libmer_std.a +lib/mercury/lib/asm_fast.gc.tr/${MACHINE_GNU_PLATFORM}/libmer_trace.a +lib/mercury/lib/asm_fast.gc/${MACHINE_GNU_PLATFORM}/libmer_browser.a +lib/mercury/lib/asm_fast.gc/${MACHINE_GNU_PLATFORM}/libmer_rt.a +lib/mercury/lib/asm_fast.gc/${MACHINE_GNU_PLATFORM}/libmer_std.a +lib/mercury/lib/asm_fast.gc/${MACHINE_GNU_PLATFORM}/libmer_trace.a +lib/mercury/lib/asm_fast.prof/${MACHINE_GNU_PLATFORM}/libmer_browser.a +lib/mercury/lib/asm_fast.prof/${MACHINE_GNU_PLATFORM}/libmer_rt.a +lib/mercury/lib/asm_fast.prof/${MACHINE_GNU_PLATFORM}/libmer_std.a +lib/mercury/lib/asm_fast.prof/${MACHINE_GNU_PLATFORM}/libmer_trace.a +lib/mercury/lib/asm_fast/${MACHINE_GNU_PLATFORM}/libmer_browser.a +lib/mercury/lib/asm_fast/${MACHINE_GNU_PLATFORM}/libmer_rt.a +lib/mercury/lib/asm_fast/${MACHINE_GNU_PLATFORM}/libmer_std.a +lib/mercury/lib/asm_fast/${MACHINE_GNU_PLATFORM}/libmer_trace.a +lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/libmer_browser.a +lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/libmer_rt.a +lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/libmer_std.a +lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/libmer_trace.a +lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/libmer_browser.a +lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/libmer_rt.a +lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/libmer_std.a +lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/libmer_trace.a lib/mercury/mdb/mdbrc lib/mercury/mmake/Mmake.rules lib/mercury/mmake/Mmake.vars @@ -832,30 +832,30 @@ share/examples/mercury/tests/subdir_runtests @dirrm lib/mercury/modules @dirrm lib/mercury/mmake @dirrm lib/mercury/mdb -@dirrm lib/mercury/lib/hlc.par.gc/${MACHINE_ARCH}--${LOWER_OPSYS} +@dirrm lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}} @dirrm lib/mercury/lib/hlc.par.gc -@dirrm lib/mercury/lib/hlc.gc/${MACHINE_ARCH}--${LOWER_OPSYS} +@dirrm lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM} @dirrm lib/mercury/lib/hlc.gc -@dirrm lib/mercury/lib/asm_fast/${MACHINE_ARCH}--${LOWER_OPSYS} -@dirrm lib/mercury/lib/asm_fast.prof/${MACHINE_ARCH}--${LOWER_OPSYS} +@dirrm lib/mercury/lib/asm_fast/${MACHINE_GNU_PLATFORM} +@dirrm lib/mercury/lib/asm_fast.prof/${MACHINE_GNU_PLATFORM} @dirrm lib/mercury/lib/asm_fast.prof -@dirrm lib/mercury/lib/asm_fast.gc/${MACHINE_ARCH}--${LOWER_OPSYS} -@dirrm lib/mercury/lib/asm_fast.gc.tr/${MACHINE_ARCH}--${LOWER_OPSYS} -@dirrm lib/mercury/lib/asm_fast.gc.tr.debug/${MACHINE_ARCH}--${LOWER_OPSYS} +@dirrm lib/mercury/lib/asm_fast.gc/${MACHINE_GNU_PLATFORM} +@dirrm lib/mercury/lib/asm_fast.gc.tr/${MACHINE_GNU_PLATFORM} +@dirrm lib/mercury/lib/asm_fast.gc.tr.debug/${MACHINE_GNU_PLATFORM} @dirrm lib/mercury/lib/asm_fast.gc.tr.debug @dirrm lib/mercury/lib/asm_fast.gc.tr -@dirrm lib/mercury/lib/asm_fast.gc.prof/${MACHINE_ARCH}--${LOWER_OPSYS} +@dirrm lib/mercury/lib/asm_fast.gc.prof/${MACHINE_GNU_PLATFORM} @dirrm lib/mercury/lib/asm_fast.gc.prof -@dirrm lib/mercury/lib/asm_fast.gc.memprof/${MACHINE_ARCH}--${LOWER_OPSYS} +@dirrm lib/mercury/lib/asm_fast.gc.memprof/${MACHINE_GNU_PLATFORM} @dirrm lib/mercury/lib/asm_fast.gc.memprof @dirrm lib/mercury/lib/asm_fast.gc @dirrm lib/mercury/lib/asm_fast -@dirrm lib/mercury/lib/${MACHINE_ARCH}--${LOWER_OPSYS} +@dirrm lib/mercury/lib/${MACHINE_GNU_PLATFORM} @dirrm lib/mercury/lib @dirrm lib/mercury/ints/Mercury @dirrm lib/mercury/ints @dirrm lib/mercury/inc/machdeps @dirrm lib/mercury/inc -@dirrm lib/mercury/bin/${MACHINE_ARCH}--${LOWER_OPSYS} +@dirrm lib/mercury/bin/${MACHINE_GNU_PLATFORM} @dirrm lib/mercury/bin @dirrm lib/mercury diff --git a/math/octave/PLIST b/math/octave/PLIST index a02cb1d9b013..14c1908bccb7 100644 --- a/math/octave/PLIST +++ b/math/octave/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2002/02/18 15:14:33 seb Exp $ +@comment $NetBSD: PLIST,v 1.4 2002/03/18 07:58:46 fredb Exp $ bin/octave bin/octave-bug bin/mkoctfile @@ -235,11 +235,11 @@ lib/${PKGNAME}/liboctave.a lib/${PKGNAME}/liboctinterp.a @exec ln -s ${PKGNAME} %D/lib/octave @unexec ${RM} -f %D/lib/octave -libexec/octave/2.0.16/exec/${MACHINE_GNU_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS}/info-emacs-info -libexec/octave/2.0.16/exec/${MACHINE_GNU_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS}/info-emacs-octave-help -@exec ${MKDIR} -p %D/libexec/octave/2.0.16/oct/${MACHINE_GNU_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS} -@exec ${MKDIR} -p %D/libexec/octave/site/exec/${MACHINE_GNU_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS} -@exec ${MKDIR} -p %D/libexec/octave/site/oct/${MACHINE_GNU_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS} +libexec/octave/2.0.16/exec/${MACHINE_GNU_PLATFORM}/info-emacs-info +libexec/octave/2.0.16/exec/${MACHINE_GNU_PLATFORM}/info-emacs-octave-help +@exec ${MKDIR} -p %D/libexec/octave/2.0.16/oct/${MACHINE_GNU_PLATFORM} +@exec ${MKDIR} -p %D/libexec/octave/site/exec/${MACHINE_GNU_PLATFORM} +@exec ${MKDIR} -p %D/libexec/octave/site/oct/${MACHINE_GNU_PLATFORM} libexec/octave/ls-R man/man1/octave.1 share/octave/2.0.16/doc/Octave-FAQ.ps @@ -654,14 +654,14 @@ share/octave/site/m/startup/octaverc share/octave/ls-R @dirrm include/${PKGNAME} @dirrm lib/${PKGNAME} -@dirrm libexec/octave/site/exec/${MACHINE_GNU_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS} +@dirrm libexec/octave/site/exec/${MACHINE_GNU_PLATFORM} @dirrm libexec/octave/site/exec -@dirrm libexec/octave/site/oct/${MACHINE_GNU_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS} +@dirrm libexec/octave/site/oct/${MACHINE_GNU_PLATFORM} @dirrm libexec/octave/site/oct @dirrm libexec/octave/site -@dirrm libexec/octave/2.0.16/exec/${MACHINE_GNU_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS} +@dirrm libexec/octave/2.0.16/exec/${MACHINE_GNU_PLATFORM} @dirrm libexec/octave/2.0.16/exec -@dirrm libexec/octave/2.0.16/oct/${MACHINE_GNU_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS} +@dirrm libexec/octave/2.0.16/oct/${MACHINE_GNU_PLATFORM} @dirrm libexec/octave/2.0.16/oct @dirrm libexec/octave/2.0.16 @dirrm libexec/octave