svn commit: r197609 - in user/edwin/locale/share: . colldef monetdef msgdef numericdef timedef

[Edwin Groothuis]

Author: edwin
Date: Tue Sep 29 07:56:09 2009
New Revision: 197609
URL: http://svn.freebsd.org/changeset/base/197609

Log:
  Remove fields which are refering directly to me and my machine,
  they're now part of /etc/make.conf.

Modified:
  user/edwin/locale/share/Makefile.def.inc
  user/edwin/locale/share/colldef/Makefile
  user/edwin/locale/share/monetdef/Makefile
  user/edwin/locale/share/msgdef/Makefile
  user/edwin/locale/share/numericdef/Makefile
  user/edwin/locale/share/timedef/Makefile

Modified: user/edwin/locale/share/Makefile.def.inc
==============================================================================
--- user/edwin/locale/share/Makefile.def.inc	Mon Sep 28 23:52:47 2009	(r197608)
+++ user/edwin/locale/share/Makefile.def.inc	Tue Sep 29 07:56:09 2009	(r197609)
@@ -1,5 +1,15 @@
 # $FreeBSD: user/edwin/locale/share/msgdef/Makefile 196760 2009-09-02 10:12:13Z edwin $
 
+.if defined(LOCALE_DESTDIR)
+DESTDIR=	${LOCALE_DESTDIR}
+.endif
+.if defined(LOCALE_SHAREOWN)
+SHAREOWN=	${LOCALE_SHAREOWN}
+.endif
+.if defined(LOCALE_SHAREGRP)
+SHAREGRP=	${LOCALE_SHAREGRP}
+.endif
+
 #
 # Predefined variables - Not for "end-users" to look at.
 #
@@ -56,8 +66,8 @@ FILESDIR_${ccln}.${cm}.out= ${LOCALEDIR}
 
 FILES=		${ALLFILES:S/$/.out/}
 CLEANFILES=	${ALLFILES:S/$/.out/}
-.if defined(FULL)
-CLEANFILES+=	${CCLN:S/$/.src/}
+.if defined(FULL) && ${TARGET} == "TARGET_CHARACTERMAP"
+CLEANFILES=	${ALLFILES:S/$/.src/}
 .endif
 FILESNAME=	${LCTYPE}
 
@@ -291,9 +301,9 @@ _TRANSLATIONAFTER_${cm}+=	 | awk '{ gsub
 # Normal makes don't need to convert from .unicode to .src
 .  if defined(FULL)
 ${ccln}.UTF-8.src: ${ccln}.unicode
-	../../cldr/tools/unicode2src.pl \
-	    --cldr=/home/edwin/unicode/cldr/1.7.1 \
-	    --unidata=/home/edwin/unicode/UNIDATA/5.1.0/ \
+	${TOOLSDIR}/unicode2src.pl \
+	    --cldr=${CLDRDIR} \
+	    --unidata=${UNIDATADIR} \
 	    --input=${.ALLSRC} \
 	    --output=${.TARGET}
 
@@ -304,6 +314,7 @@ ${ccln}.UTF-8.out: ${ccln}.UTF-8.src
 
 .  if defined(CMS_${ccln})
 .   for cms in ${CMS_${ccln}}
+.    if defined(FULL)
 
 ${ccln}.${cms}.src: ${ccln}.UTF-8.src
 	cat ${.ALLSRC} \
@@ -314,6 +325,7 @@ ${ccln}.${cms}.src: ${ccln}.UTF-8.src
 	${_TRANSLATIONAFTER_${cms}} \
 	    > ${.TARGET} \
 	|| rm ${.TARGET} && exit 0
+.    endif
 
 ${ccln}.${cms}.out: ${ccln}.${cms}.src
 	grep -v '^#' < ${.ALLSRC} > ${.TARGET}

Modified: user/edwin/locale/share/colldef/Makefile
==============================================================================
--- user/edwin/locale/share/colldef/Makefile	Mon Sep 28 23:52:47 2009	(r197608)
+++ user/edwin/locale/share/colldef/Makefile	Tue Sep 29 07:56:09 2009	(r197609)
@@ -74,11 +74,6 @@ LEGLINK_la_LN.US-ASCII+=	zh_CN.eucCN zh_
 LCTYPE=		LC_COLLATE
 LOCALEDIR=	/usr/share/locale
 
-# For testing only
-DESTDIR=	/home/edwin/locale/new/
-SHAREOWN=	edwin
-SHAREGRP=	edwin
-
 # DONE
 #
 # All variables

Modified: user/edwin/locale/share/monetdef/Makefile
==============================================================================
--- user/edwin/locale/share/monetdef/Makefile	Mon Sep 28 23:52:47 2009	(r197608)
+++ user/edwin/locale/share/monetdef/Makefile	Tue Sep 29 07:56:09 2009	(r197609)
@@ -101,11 +101,6 @@ LOCALEDIR=	/usr/share/locale
 #ICONV_pt_PT.ISO8859-1=	bsdiconv
 #ICONV_ko_KR.eucKR=	bsdiconv
 
-# For testing only
-DESTDIR=	/home/edwin/locale/new/
-SHAREOWN=	edwin
-SHAREGRP=	edwin
-
 #
 # All variables
 #

Modified: user/edwin/locale/share/msgdef/Makefile
==============================================================================
--- user/edwin/locale/share/msgdef/Makefile	Mon Sep 28 23:52:47 2009	(r197608)
+++ user/edwin/locale/share/msgdef/Makefile	Tue Sep 29 07:56:09 2009	(r197609)
@@ -92,11 +92,6 @@ LEGLINK_sr_Latn_RS.ISO8859-2=	sr_YU.ISO8
 LCTYPE=		LC_MESSAGES
 LOCALEDIR=	/usr/share/locale
 
-# For testing only
-DESTDIR=	/home/edwin/locale/new/
-SHAREOWN=	edwin
-SHAREGRP=	edwin
-
 #
 # All variables
 #

Modified: user/edwin/locale/share/numericdef/Makefile
==============================================================================
--- user/edwin/locale/share/numericdef/Makefile	Mon Sep 28 23:52:47 2009	(r197608)
+++ user/edwin/locale/share/numericdef/Makefile	Tue Sep 29 07:56:09 2009	(r197609)
@@ -88,11 +88,6 @@ LEGLINK_zh_Hans_CN.GBK2312=	zh_CN.GBK
 LCTYPE=		LC_NUMERIC
 LOCALEDIR=	/usr/share/locale
 
-# For testing only
-DESTDIR=	/home/edwin/locale/new/
-SHAREOWN=	edwin
-SHAREGRP=	edwin
-
 #
 # All variables
 #

Modified: user/edwin/locale/share/timedef/Makefile
==============================================================================
--- user/edwin/locale/share/timedef/Makefile	Mon Sep 28 23:52:47 2009	(r197608)
+++ user/edwin/locale/share/timedef/Makefile	Tue Sep 29 07:56:09 2009	(r197609)
@@ -111,11 +111,6 @@ LEGLINK_zh_Hans_CN.GBK2312=	zh_CN.GBK
 LCTYPE=		LC_TIME
 LOCALEDIR=	/usr/share/locale
 
-# For testing only
-DESTDIR=	/home/edwin/locale/new/
-SHAREOWN=	edwin
-SHAREGRP=	edwin
-
 #
 # All variables
 #