--- cmigemo.orig/Makefile
+++ cmigemo/Makefile
@@ -5,10 +5,12 @@
 # Last Change: 19-Oct-2003.
 # Maintainer:	MURAOKA Taro <koron@tka.att.ne.jp>
 
-default: tags
-
-tags: src/*.c src/*.h
-	ctags src/*.c src/*.h
+default: gcc-rel
+install:
+	$(MAKE) -f compile/Make_gcc.mak install
+uninstall: gcc-uninstall
+clean: gcc-clean
+distclean: gcc-distclean
 
 ##############################################################################
 # for Borland C 5
--- cmigemo.orig/compile/Make_gcc.mak
+++ cmigemo/compile/Make_gcc.mak
@@ -11,10 +11,11 @@
 #
 libmigemo_LIB	= libmigemo.so.1.1.0
 libmigemo_DSO	= libmigemo.so.1
+libmigemo_STL	= libmigemo.a
 libmigemo	= libmigemo.so
 EXEEXT		=
 CFLAGS_MIGEMO	= -fPIC
-LDFLAGS_MIGEMO	= -Wl,-rpath,.,-rpath,/usr/local/lib,-rpath,/usr/lib
+LDFLAGS_MIGEMO	=
 
 include config.mk
 include compile/unix.mak
@@ -25,7 +26,10 @@
 ##############################################################################
 # ɉăCu\z@ύX
 #
-$(libmigemo_LIB): $(libmigemo_DSO)
+$(libmigemo_LIB): $(libmigemo_DSO) $(libmigemo_STL)
+$(libmigemo_STL): $(libmigemo_OBJ)
+	$(AR) vru $@ $(libmigemo_OBJ)
+	ranlib $@
 $(libmigemo_DSO): $(libmigemo_OBJ)
 	$(CC) -shared -o $(libmigemo_LIB) -Wl,-soname,$@ $(libmigemo_OBJ)
 	$(RM) $@ $(libmigemo)
@@ -34,6 +38,7 @@
 
 install-lib: $(libmigemo_DSO)
 	$(INSTALL_PROGRAM) $(libmigemo_LIB) $(libdir)
+	$(INSTALL_PROGRAM) $(libmigemo_STL) $(libdir)
 	$(RM) $(libdir)/$(libmigemo_DSO) $(libdir)/$(libmigemo)
 	ln -s $(libmigemo_LIB) $(libdir)/$(libmigemo_DSO)
 	ln -s $(libmigemo_LIB) $(libdir)/$(libmigemo)
--- cmigemo.orig/compile/config.mk.in
+++ cmigemo/compile/config.mk.in
@@ -14,12 +14,12 @@
 #
 prefix		= ${PATH_PREFIX}
 bindir		= $(prefix)/bin
-libdir		= $(prefix)/lib
+libdir		= $(prefix)/lib/$(DEB_HOST_MULTIARCH)
 incdir		= $(prefix)/include
 # WARNING: Directories $(dictdir) and $(docdir) will be deleted whole the
 # directory when unintall.
-dictdir		= $(prefix)/share/migemo
-docdir		= $(prefix)/doc/migemo
+dictdir		= $(prefix)/share/cmigemo
+docdir		= $(prefix)/share/doc/cmigemo
 
 ##############################################################################
 # Commands
--- cmigemo.orig/compile/unix.mak
+++ cmigemo/compile/unix.mak
@@ -10,9 +10,9 @@
 libmigemo_OBJ = $(OBJ)
 
 DEFINES	=
-CFLAGS	= -O2 -Wall $(DEFINES) $(CFLAGS_MIGEMO)
-LDFLAGS = $(LDFLAGS_MIGEMO)
-LIBS	= 
+CFLAGS	= $(shell dpkg-buildflags --get CFLAGS) $(DEFINES) $(CFLAGS_MIGEMO)
+LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS) $(LDFLAGS_MIGEMO)
+LIBS	=
 
 default: dirs $(outdir)cmigemo$(EXEEXT)
 
@@ -44,6 +44,7 @@
 	$(MKDIR) $(dictdir)/cp932
 	$(MKDIR) $(dictdir)/euc-jp
 	$(MKDIR) $(dictdir)/utf-8
+	$(MKDIR) $(dictdir)/tools
 
 install-dict:
 	$(INSTALL_DATA) dict/migemo-dict $(dictdir)/cp932
@@ -66,10 +67,16 @@
 	  $(INSTALL_DATA) dict/utf-8.d/zen2han.dat $(dictdir)/utf-8; \
 	fi
 
-install: $(outdir)cmigemo$(EXEEXT) $(libmigemo_DSO) install-mkdir install-dict install-lib
+install: $(outdir)cmigemo$(EXEEXT) $(libmigemo_DSO) install-mkdir install-lib
 	$(INSTALL_DATA) $(srcdir)migemo.h $(incdir)
 	$(INSTALL_DATA) doc/README_j.txt $(docdir)
+	$(INSTALL_DATA) dict/han2zen.dat $(dictdir)/cp932
+	$(INSTALL_DATA) dict/hira2kata.dat $(dictdir)/cp932
+	$(INSTALL_DATA) dict/roma2hira.dat $(dictdir)/cp932
+	$(INSTALL_DATA) dict/zen2han.dat $(dictdir)/cp932
 	$(INSTALL_PROGRAM) $(outdir)cmigemo$(EXEEXT) $(bindir)
+	$(INSTALL_PROGRAM) tools/optimize-dict.pl $(dictdir)/tools
+	$(INSTALL_PROGRAM) tools/skk2migemo.pl $(dictdir)/tools
 
 ##############################################################################
 # Uninstall
--- cmigemo.orig/configure
+++ cmigemo/configure
@@ -28,18 +28,6 @@
   esac
 done
 
-# Check HTTP access tool
-if CHECK_COMMAND curl ; then
-  PROGRAM_HTTP="curl -O"
-elif CHECK_COMMAND wget ; then
-  PROGRAM_HTTP="wget"
-elif CHECK_COMMAND fetch ; then
-  PROGRAM_HTTP="fetch"
-else
-  echo "ERROR: Require one of HTTP access tools (curl, wget or fetch)."
-  exit 1
-fi
-
 # Check encoding filter
 if CHECK_COMMAND qkc ; then
   PROGRAM_ENCODEFILTER="qkc -q -u"
@@ -64,7 +52,6 @@
 # for Debug
 if test 0 != 0 ; then
   echo "PATH_PREFIX=${PATH_PREFIX}" 1>&2
-  echo "PROGRAM_HTTP=${PROGRAM_HTTP}" 1>&2
   echo "PROGRAM_ENCODEFILTER=${PROGRAM_ENCODEFILTER}" 1>&2
   echo "PROGRAM_INSTALL=${PROGRAM_INSTALL}" 1>&2
 fi
