[Modconf-commits] r209 - in trunk/modconf: . debian

[Frank Lichtenheld]

Author: djpig
Date: 2007-05-11 00:24:45 +0000 (Fri, 11 May 2007)
New Revision: 209

Modified:
   trunk/modconf/Makefile
   trunk/modconf/debian/control
Log:
Using ascii//translit turned out to be more troublesome than I thought.
You can't actually use it under LANG=C, you need an actual locale.


Modified: trunk/modconf/Makefile
===================================================================
--- trunk/modconf/Makefile	2007-05-10 23:23:52 UTC (rev 208)
+++ trunk/modconf/Makefile	2007-05-11 00:24:45 UTC (rev 209)
@@ -62,15 +62,20 @@
 	cat build/$@.1 build/$@.4 build/$@.2 > $@
 	rm -f build/$@.[1-4]
 
-build/eval_%.auto: build/kerneldsc
+build/eval_%.auto: build/kerneldsc build/locale
 	[ -d build ] || mkdir build
 	cat build/kerneldsc | sort | uniq > $@.tmp
-	iconv -f utf-8 -t $(charset-$(patsubst build/eval_%.auto,%,$@)) < $@.tmp >$@
+	LC_ALL= LOCPATH=$(CURDIR)/build/locale LANG=en_US.UTF-8 iconv -f utf-8 -t $(charset-$(patsubst build/eval_%.auto,%,$@)) < $@.tmp >$@
 	rm -f $@.tmp
 
 build/kerneldsc:
 	debian/mkkerneldesc.pl "$(KERNELTREE26)" > build/kerneldsc
 
+# we need that for ascii//translit
+build/locale:
+	mkdir -p build/locale
+	localedef -i en_US -f UTF-8 build/locale/en_US.UTF-8
+
 count: $(EVALTARGETS)
 	@for i in $(EVALTARGETS); do \
 	  echo -n "$$i "; \

Modified: trunk/modconf/debian/control
===================================================================
--- trunk/modconf/debian/control	2007-05-10 23:23:52 UTC (rev 208)
+++ trunk/modconf/debian/control	2007-05-11 00:24:45 UTC (rev 209)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Frank Lichtenheld <djpig at debian.org>
 Build-Depends: debhelper (>= 5)
-Build-Depends-Indep: linux-tree-2.6.20
+Build-Depends-Indep: linux-tree-2.6.20, locales
 Standards-Version: 3.7.2
 
 Package: modconf