Author: aurel32
Date: 2011-06-04 14:56:10 +0000 (Sat, 04 Jun 2011)
New Revision: 4702
Modified:
glibc-package/trunk/debian/rules.d/build.mk
Log:
Correctly create gconv-modules.cache with multiarch paths
Modified: glibc-package/trunk/debian/rules.d/build.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/build.mk 2011-06-04 14:43:35 UTC (rev
4701)
+++ glibc-package/trunk/debian/rules.d/build.mk 2011-06-04 14:56:10 UTC (rev
4702)
@@ -135,12 +135,13 @@
$(MAKE) -C $(DEB_BUILDDIR) \
install_root=$(CURDIR)/debian/tmp-$(curpass) install
-ifneq (,$(findstring $(call xx,slibdir), /lib /lib32 /lib64))
# Generate gconv-modules.cache
- /usr/sbin/iconvconfig --nostdlib
--prefix=$(CURDIR)/debian/tmp-$(curpass) \
- -o $(CURDIR)/debian/tmp-$(curpass)/$(call
xx,libdir)/gconv/gconv-modules.cache \
- $(call xx,libdir)/gconv
-endif
+ case $(curpass)-$(call xx,slibdir) in libc-* | *-/lib32 | *-/lib64) \
+ /usr/sbin/iconvconfig --nostdlib
--prefix=$(CURDIR)/debian/tmp-$(curpass) \
+ -o $(CURDIR)/debian/tmp-$(curpass)/$(call
xx,libdir)/gconv/gconv-modules.cache \
+ $(call xx,libdir)/gconv \
+ ;; \
+ esac
# Generate the list of SUPPORTED locales
if [ $(curpass) = libc ]; then \
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
