diff options
| author | bde <bde@FreeBSD.org> | 1998-07-07 23:04:25 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1998-07-07 23:04:25 +0000 |
| commit | b069e001ee757e3c755535dbd6186487ddc2c3d3 (patch) | |
| tree | c29f89fceb26f6d42690604dfc8c62025eabda71 /usr.bin/colldef | |
| parent | ecf8fb250c756b3233ebcd5bf640bb3170c6c4fe (diff) | |
| download | FreeBSD-src-b069e001ee757e3c755535dbd6186487ddc2c3d3.zip FreeBSD-src-b069e001ee757e3c755535dbd6186487ddc2c3d3.tar.gz | |
Use the installed version of colldef for `make all'. It is now
bootstrapped by `make world'. The version just built in ".."
normally won't work if the target system is not binary compatible.
Don't build or install anything if _BUILD_TOOLS is defined. Then
we only want to build and install the colldef binary, but the layout
of the colldef tree forces recursing to colldef/data for at least
the obj target even when _BUILD_TOOLS is defined.
Diffstat (limited to 'usr.bin/colldef')
| -rw-r--r-- | usr.bin/colldef/data/Makefile | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/usr.bin/colldef/data/Makefile b/usr.bin/colldef/data/Makefile index 908cc40..86c0e74 100644 --- a/usr.bin/colldef/data/Makefile +++ b/usr.bin/colldef/data/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.11 1997/11/07 15:18:11 ache Exp $ +# $Id: Makefile,v 1.12 1997/11/07 15:40:55 ache Exp $ NOMAN=YES CLEANFILES+= ${LOCALES:S/$/.out/g} @@ -14,12 +14,6 @@ LOCALES= de_DE.ISO_8859-1 \ LOCALEDIR= ${DESTDIR}/usr/share/locale -.if exists(${.OBJDIR}/../colldef) -COLLDEF=${.OBJDIR}/../colldef -.else -COLLDEF=${.CURDIR}/../colldef -.endif - ASCIILINKS = \ ko_KR.EUC ja_JP.EUC ja_JP.SJIS @@ -35,9 +29,11 @@ DELINKS = de_AT de_CH .SUFFIXES: .src .out .src.out: - ${COLLDEF} -I ${.CURDIR} -o ${.TARGET} ${.IMPSRC} + colldef -I ${.CURDIR} -o ${.TARGET} ${.IMPSRC} +.if !defined(_BUILD_TOOLS) all: ${LOCALES:S/$/.out/g} +.endif ru_SU.KOI8-R.out: map.KOI8-R ru_SU.CP866.out: map.CP866 @@ -46,6 +42,7 @@ lt_LN.ISO_8859-2.out: map.ISO_8859-2 es_ES.ISO_8859-1.out: map.ISO_8859-1 de_DE.ISO_8859-1.out: map.ISO_8859-1 +.if !defined(_BUILD_TOOLS) afterinstall: .for locale in ${LOCALES} ${INSTALL} -c -m 644 -o ${BINOWN} -g ${BINGRP} \ @@ -67,6 +64,6 @@ afterinstall: ln -fs ../de_DE.ISO_8859-1/LC_COLLATE \ ${LOCALEDIR}/${link}.ISO_8859-1/LC_COLLATE .endfor - +.endif .include <bsd.prog.mk> |
