d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use the installed version of mklocale for `make all'. It is now

Browse Source 
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 mklocale binary, but the layout
of the mklocale tree forces recursing to mklocale/data for at least
the obj target even when _BUILD_TOOLS is defined.
This commit is contained in:
bde 1998-07-07 23:05:59 +00:00
parent b069e001ee
commit 9a86d95526
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
share/mklocale/Makefile
View File

@ -1,4 +1,4 @@
# $Id: Makefile,v 1.11 1997/11/07 15:27:12 ache Exp $
# $Id: Makefile,v 1.12 1997/11/07 15:40:02 ache Exp $
NOMAN=YES
CLEANFILES+= ${LOCALES:S/$/.out/g}
@ -14,12 +14,6 @@ LOCALES= ja_JP.EUC \
LOCALEDIR= ${DESTDIR}/usr/share/locale
.if exists(${.OBJDIR}/../mklocale)
MKLOCALE=${.OBJDIR}/../mklocale
.else
MKLOCALE=${.CURDIR}/../mklocale
.endif
LATIN1LINKS = \
da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES fi_FI \
fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT nl_BE nl_NL no_NO \
@ -30,10 +24,13 @@ LATIN2LINKS = hr_HR pl_PL sl_SI
.SUFFIXES: .src .out
.src.out:
${MKLOCALE} -o ${.TARGET} ${.IMPSRC}
mklocale -o ${.TARGET} ${.IMPSRC}
.if !defined(_BUILD_TOOLS)
all: ${LOCALES:S/$/.out/g}
.endif
.if !defined(_BUILD_TOOLS)
afterinstall:
.for locale in ${LOCALES}
${INSTALL} ${COPY} -m 644 -o ${BINOWN} -g ${BINGRP} \
@ -47,5 +44,6 @@ afterinstall:
ln -fs ../lt_LN.ISO_8859-2/LC_CTYPE \
${LOCALEDIR}/${link}.ISO_8859-2/LC_CTYPE
.endfor
.endif
.include <bsd.prog.mk>

14
usr.bin/mklocale/data/Makefile
View File

@ -1,4 +1,4 @@
# $Id: Makefile,v 1.11 1997/11/07 15:27:12 ache Exp $
# $Id: Makefile,v 1.12 1997/11/07 15:40:02 ache Exp $
NOMAN=YES
CLEANFILES+= ${LOCALES:S/$/.out/g}
@ -14,12 +14,6 @@ LOCALES= ja_JP.EUC \
LOCALEDIR= ${DESTDIR}/usr/share/locale
.if exists(${.OBJDIR}/../mklocale)
MKLOCALE=${.OBJDIR}/../mklocale
.else
MKLOCALE=${.CURDIR}/../mklocale
.endif
LATIN1LINKS = \
da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES fi_FI \
fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT nl_BE nl_NL no_NO \
@ -30,10 +24,13 @@ LATIN2LINKS = hr_HR pl_PL sl_SI
.SUFFIXES: .src .out
.src.out:
${MKLOCALE} -o ${.TARGET} ${.IMPSRC}
mklocale -o ${.TARGET} ${.IMPSRC}
.if !defined(_BUILD_TOOLS)
all: ${LOCALES:S/$/.out/g}
.endif
.if !defined(_BUILD_TOOLS)
afterinstall:
.for locale in ${LOCALES}
${INSTALL} ${COPY} -m 644 -o ${BINOWN} -g ${BINGRP} \
@ -47,5 +44,6 @@ afterinstall:
ln -fs ../lt_LN.ISO_8859-2/LC_CTYPE \
${LOCALEDIR}/${link}.ISO_8859-2/LC_CTYPE
.endfor
.endif
.include <bsd.prog.mk>