--- a/pkg_import/Makefile	Wed Dec 29 18:10:25 2010 +0900
+++ b/pkg_import/Makefile	Wed Jan 12 14:05:15 2011 +0900
@@ -42,6 +42,8 @@
 
 IMPORTER=env ROOT=/ ./importer.py 
 
+PKGMACH= $(MACH)
+
 i386_DEFINES=           \
 	ARCH=i386       \
 	ARCH32=i86      \
@@ -62,6 +64,7 @@
 
 SVR4DIR1=../../../inputmethod/specs/build.$(PKGMACH)/PKGS
 SVR4DIR2=PKGS2.$(PKGMACH)
+SVR4DIR3=../../g11n-inputmethod/specs/build.$(PKGMACH)/PKGS
 SVR4PKGS2=g11nsvc
 
 IMPLIST=import_list
@@ -84,7 +87,7 @@
 	$(IMPORTER) -b 0.$(L10N_BUILDNUM) -T \* \
 	$(GLOBAL_CHATTRS:%= -G %) $(ARCH_DEFINES:%= -m %) \
 	-R $(REFREPO)@[email protected] -s $(REPO) \
-	-w $(SVR4DIR1) -w $(SVR4DIR2) -I. $(IMPLIST)
+	-w $(SVR4DIR1) -w $(SVR4DIR2) -w $(SVR4DIR3) -I. $(IMPLIST)
 
 $(SVR4DIR2)/%: $(SVR4DIR2) %.$(PKGMACH).tar
 	(cd $(SVR4DIR2); tar xf ../$(@F).$(PKGMACH).tar)

--- a/pkg_merge/mergearch.sh	Wed Dec 29 18:10:25 2010 +0900
+++ b/pkg_merge/mergearch.sh	Wed Jan 12 14:05:15 2011 +0900
@@ -7,11 +7,19 @@
 date
 
 MERGEPY=./merge.py
-if [ -z "$PKGDEST" ]
+if [ -z "$REPOTOP" ]
 then
-	REPOTOP="`cd ../pkgdest; pwd`"
-else
-	REPOTOP="$PKGDEST/.."
+	if [ -z "$PKGDEST" ]
+	then
+		REPOTOP="`cd ../pkgdest; pwd`"
+	else
+		REPOTOP="$PKGDEST/.."
+	fi
+fi
+
+if [ -z "$REPOTMP" ]
+then
+	REPOTMP=$REPOTOP
 fi
 
 merge_one_pair()
@@ -24,7 +32,7 @@
 	srx="-v i386,file://$REPOTOP/i386/$reponame"
 	drd="$REPOTOP/merged/$reponame"
 	dr="file://$drd"
-	tmpd="$REPOTOP/mergearch.$$.$reponame"
+	tmpd="$REPOTMP/mergearch.$$.$reponame"
 
 	rm -rf $tmpd
 	$MERGEPY -r -d $tmpd $srs $srx arch $pkgs