diff options
| author | erwin <erwin@FreeBSD.org> | 2006-10-07 04:25:43 +0800 |
|---|---|---|
| committer | erwin <erwin@FreeBSD.org> | 2006-10-07 04:25:43 +0800 |
| commit | de798802dc8612a705718848c5e876d63e5be3e6 (patch) | |
| tree | 3f9f0ba074ff9ff230d6e485ae1571e765e63dc5 /lang | |
| parent | 7d500e9caee85ec6be02692778bee19797e1d74f (diff) | |
| download | freebsd-ports-gnome-de798802dc8612a705718848c5e876d63e5be3e6.tar.gz freebsd-ports-gnome-de798802dc8612a705718848c5e876d63e5be3e6.tar.zst freebsd-ports-gnome-de798802dc8612a705718848c5e876d63e5be3e6.zip | |
Use INST_TARGET instead of TARGETDIR to avoid the name clash
after DESTDIR was added.
PR: 104045
Submitted by: gabor
Prodded by: kris
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/pm3-base/Makefile | 6 | ||||
| -rw-r--r-- | lang/pm3-base/pkg-plist | 50 |
2 files changed, 28 insertions, 28 deletions
diff --git a/lang/pm3-base/Makefile b/lang/pm3-base/Makefile index c673559e428d..68d4b5b922da 100644 --- a/lang/pm3-base/Makefile +++ b/lang/pm3-base/Makefile @@ -23,7 +23,7 @@ INSTALL_TARGET= all MAKE_ARGS+= M3OPTIONS="-DBUILD_ALL -DSHIP_ALL" MAN1= m3bundle.1 PLIST_SUB+= SOVERSION=${SOVERSION} TARGET=${TARGET} \ - TARGETDIR=${TARGETDIR} WORDSIZE=${WORDSIZE} + INST_TARGET=${INST_TARGET} WORDSIZE=${WORDSIZE} SCRIPTS_ENV+= TARGET=${TARGET} USE_BZIP2= yes USE_GMAKE= yes @@ -46,13 +46,13 @@ SOVERSION= 7 .if ${ARCH} == "i386" TARGET= FreeBSD4 -TARGETDIR= freebsd-4 +INST_TARGET= freebsd-4 BOOTSTRAP= pm3-${PORTVERSION}-${TARGET}-boot.tar.bz2 WORDSIZE= 32 .elif ${ARCH} == "alpha" CFLAGS+= -mieee TARGET= FBSD_ALPHA -TARGETDIR= fbsd-alpha +INST_TARGET= fbsd-alpha WORDSIZE= 64 BOOTSTRAP= pm3-${PORTVERSION}-${TARGET}-boot.tar.bz2 .else diff --git a/lang/pm3-base/pkg-plist b/lang/pm3-base/pkg-plist index 9a84320dd89a..41f328863a2c 100644 --- a/lang/pm3-base/pkg-plist +++ b/lang/pm3-base/pkg-plist @@ -449,30 +449,30 @@ lib/m3/pkg/m3core/src/time/Common/Tick_i3.html lib/m3/pkg/m3core/src/time/Common/Time.i3 lib/m3/pkg/m3core/src/time/Common/Time_i3.html lib/m3/pkg/m3core/src/time/POSIX/TimePosix.i3 -lib/m3/pkg/m3core/src/unix/%%TARGETDIR%%/Udir.i3 -lib/m3/pkg/m3core/src/unix/%%TARGETDIR%%/Uerror.i3 -lib/m3/pkg/m3core/src/unix/%%TARGETDIR%%/Uexec.i3 -lib/m3/pkg/m3core/src/unix/%%TARGETDIR%%/Ugrp.i3 -lib/m3/pkg/m3core/src/unix/%%TARGETDIR%%/Uin.i3 -lib/m3/pkg/m3core/src/unix/%%TARGETDIR%%/Uipc.i3 -lib/m3/pkg/m3core/src/unix/%%TARGETDIR%%/Umman.i3 -lib/m3/pkg/m3core/src/unix/%%TARGETDIR%%/Umsg.i3 -lib/m3/pkg/m3core/src/unix/%%TARGETDIR%%/Unetdb.i3 -lib/m3/pkg/m3core/src/unix/%%TARGETDIR%%/Unix.i3 -lib/m3/pkg/m3core/src/unix/%%TARGETDIR%%/Uprocess.i3 -lib/m3/pkg/m3core/src/unix/%%TARGETDIR%%/Upwd.i3 -lib/m3/pkg/m3core/src/unix/%%TARGETDIR%%/Uresource.i3 -lib/m3/pkg/m3core/src/unix/%%TARGETDIR%%/Usem.i3 -lib/m3/pkg/m3core/src/unix/%%TARGETDIR%%/Ushm.i3 -lib/m3/pkg/m3core/src/unix/%%TARGETDIR%%/Usignal.i3 -lib/m3/pkg/m3core/src/unix/%%TARGETDIR%%/Usocket.i3 -lib/m3/pkg/m3core/src/unix/%%TARGETDIR%%/Ustat.i3 -lib/m3/pkg/m3core/src/unix/%%TARGETDIR%%/Usyslog.i3 -lib/m3/pkg/m3core/src/unix/%%TARGETDIR%%/Utime.i3 -lib/m3/pkg/m3core/src/unix/%%TARGETDIR%%/Utypes.i3 -lib/m3/pkg/m3core/src/unix/%%TARGETDIR%%/Uugid.i3 -lib/m3/pkg/m3core/src/unix/%%TARGETDIR%%/Uuio.i3 -lib/m3/pkg/m3core/src/unix/%%TARGETDIR%%/Uutmp.i3 +lib/m3/pkg/m3core/src/unix/%%INST_TARGET%%/Udir.i3 +lib/m3/pkg/m3core/src/unix/%%INST_TARGET%%/Uerror.i3 +lib/m3/pkg/m3core/src/unix/%%INST_TARGET%%/Uexec.i3 +lib/m3/pkg/m3core/src/unix/%%INST_TARGET%%/Ugrp.i3 +lib/m3/pkg/m3core/src/unix/%%INST_TARGET%%/Uin.i3 +lib/m3/pkg/m3core/src/unix/%%INST_TARGET%%/Uipc.i3 +lib/m3/pkg/m3core/src/unix/%%INST_TARGET%%/Umman.i3 +lib/m3/pkg/m3core/src/unix/%%INST_TARGET%%/Umsg.i3 +lib/m3/pkg/m3core/src/unix/%%INST_TARGET%%/Unetdb.i3 +lib/m3/pkg/m3core/src/unix/%%INST_TARGET%%/Unix.i3 +lib/m3/pkg/m3core/src/unix/%%INST_TARGET%%/Uprocess.i3 +lib/m3/pkg/m3core/src/unix/%%INST_TARGET%%/Upwd.i3 +lib/m3/pkg/m3core/src/unix/%%INST_TARGET%%/Uresource.i3 +lib/m3/pkg/m3core/src/unix/%%INST_TARGET%%/Usem.i3 +lib/m3/pkg/m3core/src/unix/%%INST_TARGET%%/Ushm.i3 +lib/m3/pkg/m3core/src/unix/%%INST_TARGET%%/Usignal.i3 +lib/m3/pkg/m3core/src/unix/%%INST_TARGET%%/Usocket.i3 +lib/m3/pkg/m3core/src/unix/%%INST_TARGET%%/Ustat.i3 +lib/m3/pkg/m3core/src/unix/%%INST_TARGET%%/Usyslog.i3 +lib/m3/pkg/m3core/src/unix/%%INST_TARGET%%/Utime.i3 +lib/m3/pkg/m3core/src/unix/%%INST_TARGET%%/Utypes.i3 +lib/m3/pkg/m3core/src/unix/%%INST_TARGET%%/Uugid.i3 +lib/m3/pkg/m3core/src/unix/%%INST_TARGET%%/Uuio.i3 +lib/m3/pkg/m3core/src/unix/%%INST_TARGET%%/Uutmp.i3 lib/m3/pkg/m3core/src/weakref/WeakRef.i3 lib/m3/pkg/m3core/src/weakref/WeakRef_i3.html lib/m3/pkg/m3core/src/word/Word.i3 @@ -982,7 +982,7 @@ lib/m3/pkg/tempfiles/src/TempFiles.i3 @dirrm lib/m3/pkg/m3doc @dirrm lib/m3/pkg/m3core/src/word @dirrm lib/m3/pkg/m3core/src/weakref -@dirrm lib/m3/pkg/m3core/src/unix/%%TARGETDIR%% +@dirrm lib/m3/pkg/m3core/src/unix/%%INST_TARGET%% @dirrm lib/m3/pkg/m3core/src/unix @dirrm lib/m3/pkg/m3core/src/time/POSIX @dirrm lib/m3/pkg/m3core/src/time/Common |