From owner-svn-src-head@freebsd.org Wed Nov 11 18:45:50 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 647ECA2C5F4; Wed, 11 Nov 2015 18:45:50 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3AB121D49; Wed, 11 Nov 2015 18:45:50 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tABIjn35004910; Wed, 11 Nov 2015 18:45:49 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tABIjmwQ004902; Wed, 11 Nov 2015 18:45:48 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201511111845.tABIjmwQ004902@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Wed, 11 Nov 2015 18:45:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r290677 - in head: share/colldef share/ctypedef share/monetdef share/msgdef share/numericdef share/timedef tools/tools/locale/tools X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Nov 2015 18:45:50 -0000 Author: bdrewery Date: Wed Nov 11 18:45:48 2015 New Revision: 290677 URL: https://svnweb.freebsd.org/changeset/base/290677 Log: Use explicit filename when creating locale symlinks to avoid creating a directory symlink when the target directory does not exist. This will cause an error instead of a broken setup. Sponsored by: EMC / Isilon Storage Division Modified: head/share/colldef/Makefile head/share/ctypedef/Makefile head/share/monetdef/Makefile head/share/msgdef/Makefile head/share/numericdef/Makefile head/share/timedef/Makefile head/tools/tools/locale/tools/cldr2def.pl Modified: head/share/colldef/Makefile ============================================================================== --- head/share/colldef/Makefile Wed Nov 11 16:24:52 2015 (r290676) +++ head/share/colldef/Makefile Wed Nov 11 18:45:48 2015 (r290677) @@ -175,7 +175,8 @@ FILES= ${LOCALES:S/$/.LC_COLLATE/} CLEANFILES= ${FILES} .for f in ${SAME} -SYMLINKS+= ../${f:C/:.*$//}/${FILESNAME} ${LOCALEDIR}/${f:C/^.*://} +SYMLINKS+= ../${f:C/:.*$//}/${FILESNAME} \ + ${LOCALEDIR}/${f:C/^.*://}/${FILESNAME} .endfor .for f in ${LOCALES} Modified: head/share/ctypedef/Makefile ============================================================================== --- head/share/ctypedef/Makefile Wed Nov 11 16:24:52 2015 (r290676) +++ head/share/ctypedef/Makefile Wed Nov 11 18:45:48 2015 (r290677) @@ -176,7 +176,8 @@ FILES= ${LOCALES:S/$/.LC_CTYPE/} CLEANFILES= ${FILES} .for f in ${SAME} -SYMLINKS+= ../${f:C/:.*$//}/${FILESNAME} ${LOCALEDIR}/${f:C/^.*://} +SYMLINKS+= ../${f:C/:.*$//}/${FILESNAME} \ + ${LOCALEDIR}/${f:C/^.*://}/${FILESNAME} .endfor .for f in ${LOCALES} Modified: head/share/monetdef/Makefile ============================================================================== --- head/share/monetdef/Makefile Wed Nov 11 16:24:52 2015 (r290676) +++ head/share/monetdef/Makefile Wed Nov 11 18:45:48 2015 (r290677) @@ -173,7 +173,8 @@ FILES= ${LOCALES:S/$/.out/} CLEANFILES= ${FILES} .for f in ${SAME} -SYMLINKS+= ../${f:C/:.*$//}/${FILESNAME} ${LOCALEDIR}/${f:C/^.*://} +SYMLINKS+= ../${f:C/:.*$//}/${FILESNAME} \ + ${LOCALEDIR}/${f:C/^.*://}/${FILESNAME} .endfor .for f in ${LOCALES} Modified: head/share/msgdef/Makefile ============================================================================== --- head/share/msgdef/Makefile Wed Nov 11 16:24:52 2015 (r290676) +++ head/share/msgdef/Makefile Wed Nov 11 18:45:48 2015 (r290677) @@ -173,7 +173,8 @@ FILES= ${LOCALES:S/$/.out/} CLEANFILES= ${FILES} .for f in ${SAME} -SYMLINKS+= ../${f:C/:.*$//}/${FILESNAME} ${LOCALEDIR}/${f:C/^.*://} +SYMLINKS+= ../${f:C/:.*$//}/${FILESNAME} \ + ${LOCALEDIR}/${f:C/^.*://}/${FILESNAME} .endfor .for f in ${LOCALES} Modified: head/share/numericdef/Makefile ============================================================================== --- head/share/numericdef/Makefile Wed Nov 11 16:24:52 2015 (r290676) +++ head/share/numericdef/Makefile Wed Nov 11 18:45:48 2015 (r290677) @@ -173,7 +173,8 @@ FILES= ${LOCALES:S/$/.out/} CLEANFILES= ${FILES} .for f in ${SAME} -SYMLINKS+= ../${f:C/:.*$//}/${FILESNAME} ${LOCALEDIR}/${f:C/^.*://} +SYMLINKS+= ../${f:C/:.*$//}/${FILESNAME} \ + ${LOCALEDIR}/${f:C/^.*://}/${FILESNAME} .endfor .for f in ${LOCALES} Modified: head/share/timedef/Makefile ============================================================================== --- head/share/timedef/Makefile Wed Nov 11 16:24:52 2015 (r290676) +++ head/share/timedef/Makefile Wed Nov 11 18:45:48 2015 (r290677) @@ -173,7 +173,8 @@ FILES= ${LOCALES:S/$/.out/} CLEANFILES= ${FILES} .for f in ${SAME} -SYMLINKS+= ../${f:C/:.*$//}/${FILESNAME} ${LOCALEDIR}/${f:C/^.*://} +SYMLINKS+= ../${f:C/:.*$//}/${FILESNAME} \ + ${LOCALEDIR}/${f:C/^.*://}/${FILESNAME} .endfor .for f in ${LOCALES} Modified: head/tools/tools/locale/tools/cldr2def.pl ============================================================================== --- head/tools/tools/locale/tools/cldr2def.pl Wed Nov 11 16:24:52 2015 (r290676) +++ head/tools/tools/locale/tools/cldr2def.pl Wed Nov 11 18:45:48 2015 (r290677) @@ -946,7 +946,8 @@ FILES= \${LOCALES:S/\$/.${SRCOUT2}/} CLEANFILES= \${FILES} .for f in \${SAME} -SYMLINKS+= ../\${f:C/:.*\$//}/\${FILESNAME} \${LOCALEDIR}/\${f:C/^.*://} +SYMLINKS+= ../\${f:C/:.*\$//}/\${FILESNAME} \\ + \${LOCALEDIR}/\${f:C/^.*://}/\${FILESNAME} .endfor .for f in \${LOCALES}