r1467 - glibc-package/branches/glibc-2.4/debian/rules.d
Author: barbier
Date: 2006-05-04 21:00:48 +0000 (Thu, 04 May 2006)
New Revision: 1467
Modified:
glibc-package/branches/glibc-2.4/debian/rules.d/build.mk
Log:
Merge r1417:1442 from trunk: fix generation of locales-all
Modified: glibc-package/branches/glibc-2.4/debian/rules.d/build.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/rules.d/build.mk 2006-05-04 20:52:54 UTC (rev 1466)
+++ glibc-package/branches/glibc-2.4/debian/rules.d/build.mk 2006-05-04 21:00:48 UTC (rev 1467)
@@ -104,9 +104,12 @@
if [ $(curpass) = libc ]; then \
$(MAKE) -f debian/generate-supported.mk IN=$(DEB_SRCDIR)/localedata/SUPPORTED \
OUT=debian/tmp-$(curpass)/usr/share/i18n/SUPPORTED; \
- $(MAKE) -C $(DEB_SRCDIR)/localedata -j $(NJOBS) \
+ $(MAKE) -C $(DEB_BUILDDIR) -j $(NJOBS) \
objdir=$(DEB_BUILDDIR) install_root=$(CURDIR)/debian/tmp-$(curpass) \
- install-locales; \
+ localedata/install-locales; \
+ rm -rf $(CURDIR)/debian/locales-all/usr/lib; \
+ install -d $(CURDIR)/debian/locales-all/usr/lib; \
+ mv $(CURDIR)/debian/tmp-libc/usr/lib/locale $(CURDIR)/debian/locales-all/usr/lib/locales-all; \
(cd $(DEB_SRCDIR)/manual && texi2html -split_chapter libc.texinfo); \
fi
Reply to: