3 files changed, 12 insertions, 36 deletions

diff --git a/korean/libhangul/files/patch-Makefile.in b/korean/libhangul/files/patch-Makefile.in
index 24454cf33c5c..a39824fbbd02 100644
--- a/korean/libhangul/files/patch-Makefile.in
+++ b/korean/libhangul/files/patch-Makefile.in
@@ -1,9 +1,9 @@
---- ./Makefile.in.orig	2008-04-20 10:01:45.000000000 +0300
-+++ ./Makefile.in	2008-04-22 11:57:45.000000000 +0300
+--- Makefile.in.orig	2009-01-06 21:00:36.000000000 +0900
++++ Makefile.in	2009-01-06 20:43:42.000000000 +0900
 @@ -191,7 +191,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = hangul tools data test
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ SUBDIRS = hangul data test
 -pkgconfigdir = $(libdir)/pkgconfig
 +pkgconfigdir = $(prefix)/libdata/pkgconfig
  pkgconfig_DATA = libhangul.pc
diff --git a/korean/libhangul/files/patch-data__hanja__Makefile.in b/korean/libhangul/files/patch-data__hanja__Makefile.in
deleted file mode 100644
index 71f513fd5949..000000000000
--- a/korean/libhangul/files/patch-data__hanja__Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./data/hanja/Makefile.in.orig	2008-04-20 10:01:44.000000000 +0300
-+++ ./data/hanja/Makefile.in	2008-04-22 11:57:45.000000000 +0300
-@@ -378,7 +378,7 @@
- 
- 
- $(hanjadicbin_DATA): hanja.txt ../../tools/hanjac
--	../../tools/hanjac $< $@
-+	../../tools/hanjac hanja.txt hanja.bin
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/korean/libhangul/files/patch-test b/korean/libhangul/files/patch-test
index 07743dd50443..b08a4d8d7c41 100644
--- a/korean/libhangul/files/patch-test
+++ b/korean/libhangul/files/patch-test
@@ -1,27 +1,14 @@
---- ../libhangul-0.0.8_orig/test/Makefile.in	2008-04-20 16:01:44.000000000 +0900
-+++ test/Makefile.in	2008-04-21 18:12:41.000000000 +0900
+--- test/Makefile.in.orig	2009-01-06 21:01:57.000000000 +0900
++++ test/Makefile.in	2009-01-06 20:49:06.000000000 +0900
 @@ -184,9 +184,11 @@
  hangul_CFLAGS = 
  hangul_SOURCES = hangul.c
  hangul_LDADD = ../hangul/libhangul.la
-+hangul_LDFLAGS = -liconv 
++hangul_LDFLAGS = -liconv
  hanja_CFLAGS = 
  hanja_SOURCES = hanja.c
  hanja_LDADD = ../hangul/libhangul.la
-+hanja_LDFLAGS = -liconv 
- all: all-am
- 
- .SUFFIXES:
-@@ -229,10 +231,10 @@
- 	done
- hangul$(EXEEXT): $(hangul_OBJECTS) $(hangul_DEPENDENCIES) 
- 	@rm -f hangul$(EXEEXT)
--	$(hangul_LINK) $(hangul_OBJECTS) $(hangul_LDADD) $(LIBS)
-+	$(hangul_LINK) $(hangul_OBJECTS) $(hangul_LDADD) $(hangul_LDFLAGS) $(LIBS)
- hanja$(EXEEXT): $(hanja_OBJECTS) $(hanja_DEPENDENCIES) 
- 	@rm -f hanja$(EXEEXT)
--	$(hanja_LINK) $(hanja_OBJECTS) $(hanja_LDADD) $(LIBS)
-+	$(hanja_LINK) $(hanja_OBJECTS) $(hanja_LDADD) $(hanja_LDADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
++hanja_LDFLAGS = -liconv
+ TESTS = test
+ test_SOURCES = test.c ../hangul/hangul.h
+ test_CFLAGS = @CHECK_CFLAGS@