summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog14
-rw-r--r--Makefile.am4
-rw-r--r--configure.ac1
-rw-r--r--setup/Makefile.am42
-rw-r--r--setup/main.py2
5 files changed, 61 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 139597f..6527fe7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,2 +1,16 @@
+2014-01-26 gettextize <bug-gnu-gettext@gnu.org>
+
+ * m4/gettext.m4: New file, from gettext-0.18.3.
+ * m4/iconv.m4: New file, from gettext-0.18.3.
+ * m4/lib-ld.m4: New file, from gettext-0.18.3.
+ * m4/lib-link.m4: New file, from gettext-0.18.3.
+ * m4/lib-prefix.m4: New file, from gettext-0.18.3.
+ * m4/nls.m4: New file, from gettext-0.18.3.
+ * m4/po.m4: New file, from gettext-0.18.3.
+ * m4/progtest.m4: New file, from gettext-0.18.3.
+ * Makefile.am (SUBDIRS): Add po.
+ (EXTRA_DIST): New variable.
+ * configure.ac (AC_CONFIG_FILES): Add po/Makefile.in.
+
diff --git a/Makefile.am b/Makefile.am
index 2b03ae9..bcec3a8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Created by Anjuta
-SUBDIRS = src
+SUBDIRS = po src setup
dist_doc_DATA = \
README \
@@ -16,3 +16,5 @@ dist_doc_DATA = \
# Remove doc directory on uninstall
uninstall-local:
-rm -r $(docdir)
+
+EXTRA_DIST = config.rpath
diff --git a/configure.ac b/configure.ac
index 2939d8a..4a9d0ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -109,6 +109,7 @@ AM_GLIB_GNU_GETTEXT([external])
AC_CONFIG_FILES([ po/Makefile.in
Makefile
src/Makefile
+setup/Makefile
setup/config.py
])
diff --git a/setup/Makefile.am b/setup/Makefile.am
new file mode 100644
index 0000000..a87f130
--- /dev/null
+++ b/setup/Makefile.am
@@ -0,0 +1,42 @@
+# vim:set et ts=4:
+#
+# ibus-libzhuyin - New Zhuyin engine based on libzhuyin for IBus
+#
+# Copyright (c) 2014 Peng Wu <alexepico@gmail.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+setup_libzhuyin_PYTHON = \
+ main.py \
+ config.py \
+ ibus-libzhuyin-preferences.ui \
+ $(NULL)
+
+setup_libzhuyindir = $(datadir)/ibus-libzhuyin/setup
+
+CLEANFILES = \
+ *.pyc \
+ $(NULL)
+
+EXTRA_DIST = \
+ config.py.in \
+ $(NULL)
+
+test-libzhuyin:
+ $(ENV) DBUS_DEBUG=true \
+ IBUS_LOCALEDIR=@localedir@ \
+ IBUS_PKGDATADIR=$(pkgdatadir) \
+ PYTHONPATH=$(abs_top_srcdir):$(pyexecdir) \
+ $(PYTHON) $(srcdir)/main.py
diff --git a/setup/main.py b/setup/main.py
index 93450f5..dd76999 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -32,7 +32,7 @@ import config
locale.setlocale(locale.LC_ALL, "")
localedir = os.getenv("IBUS_LOCALEDIR")
-pkgdatadir = os.getenv("IBUS_PKGDATADIR")
+pkgdatadir = os.getenv("IBUS_PKGDATADIR") or "."
gettext.install('ibus-libzhuyin', localedir)
class PreferencesWindow: