[glibc] 01/02: debian/rules, debian/rules.d/build.mk: rename localedir into complocaledir following upstream change.
This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch glibc-2.23
in repository glibc.
commit b4e1172210a7355f688d6d95f6a5db6c972086b6
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Thu Mar 24 16:03:34 2016 +0100
debian/rules, debian/rules.d/build.mk: rename localedir into complocaledir following upstream change.
---
debian/changelog | 2 ++
debian/rules | 2 +-
debian/rules.d/build.mk | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8f091fd..a5fc01e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ glibc (2.23-0experimental2) UNRELEASED; urgency=medium
[ Aurelien Jarno ]
* patches/kfreebsd/local-fbtl.diff: update to revision 5972 (from
glibc-bsd).
+ * debian/rules, debian/rules.d/build.mk: rename localedir into complocaledir
+ following upstream change.
[ Adam Conrad ]
* debian/testsuite-xfail-debian.mk: Also allow tst-malloc-thread-fail to
diff --git a/debian/rules b/debian/rules
index 0f6473e..9c4511e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -87,7 +87,7 @@ GLIBC_PASSES ?= libc
prefix=/usr
bindir=$(prefix)/bin
datadir=$(prefix)/share
-localedir=$(prefix)/lib/locale
+complocaledir=$(prefix)/lib/locale
sysconfdir=/etc
libexecdir=$(prefix)/lib
rootsbindir=/sbin
diff --git a/debian/rules.d/build.mk b/debian/rules.d/build.mk
index 413ad1a..685a683 100644
--- a/debian/rules.d/build.mk
+++ b/debian/rules.d/build.mk
@@ -45,7 +45,7 @@ $(stamp)configure_%: $(stamp)mkbuilddir_%
echo "LIBGD = no" >> $(DEB_BUILDDIR)/configparms
echo "bindir = $(bindir)" >> $(DEB_BUILDDIR)/configparms
echo "datadir = $(datadir)" >> $(DEB_BUILDDIR)/configparms
- echo "localedir = $(localedir)" >> $(DEB_BUILDDIR)/configparms
+ echo "complocaledir = $(complocaledir)" >> $(DEB_BUILDDIR)/configparms
echo "sysconfdir = $(sysconfdir)" >> $(DEB_BUILDDIR)/configparms
echo "libexecdir = $(libexecdir)" >> $(DEB_BUILDDIR)/configparms
echo "rootsbindir = $(rootsbindir)" >> $(DEB_BUILDDIR)/configparms
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: