ibus-setup-hangul also should be generated by Make

diff --git a/configure.ac b/configure.ac
index f23faba..d37b184 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -83,7 +83,6 @@ ibus-hangul.spec
 src/Makefile
 src/hangul.xml.in
 setup/Makefile
-setup/ibus-setup-hangul
 icons/Makefile
 data/Makefile
 m4/Makefile

diff --git a/setup/Makefile.am b/setup/Makefile.am
index 71f4e46..75ce836 100644 (file)
--- a/setup/Makefile.am
+++ b/setup/Makefile.am
@@ -40,6 +40,7 @@ hangul_keyboard_list_LDADD = $(HANGUL_LIBS)
 
 
 CLEANFILES = \
+       ibus-setup-hangul \
        config.py \
        *.pyc \
        $(NULL)
@@ -60,4 +61,5 @@ config.py: config.py.in Makefile
            -e 's&@SETUP_PKGDATADIR@&$(pkgdatadir)&g' \
            -e 's&@SETUP_PKGLIBDIR@&$(pkglibdir)&g' $< > $@
 
-ibus-setup-hangul: config.py
+ibus-setup-hangul: ibus-setup-hangul.in config.py Makefile
+       sed -e 's&@SETUP_PKGDATADIR@&$(pkgdatadir)&g' $< > $@

diff --git a/setup/ibus-setup-hangul.in b/setup/ibus-setup-hangul.in
index 68678fa..6b68cdc 100644 (file)
--- a/setup/ibus-setup-hangul.in
+++ b/setup/ibus-setup-hangul.in
@@ -19,5 +19,5 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-exec python @prefix@/share/ibus-hangul/setup/main.py $@
+exec python @SETUP_PKGDATADIR@/setup/main.py $@