diff options
| author | Huang Peng <shawn.p.huang@gmail.com> | 2009-02-27 09:07:18 +0800 |
|---|---|---|
| committer | Huang Peng <shawn.p.huang@gmail.com> | 2009-02-27 09:07:18 +0800 |
| commit | 8db276818d12776ba0cd7819972fa5ce30005164 (patch) | |
| tree | d08901e4c1a142ecf80e41150625b7fee389ffe9 | |
| parent | fc9e5a5b087f68dc1239ad7629a1575fb83510ac (diff) | |
| download | ibus-8db276818d12776ba0cd7819972fa5ce30005164.tar.gz ibus-8db276818d12776ba0cd7819972fa5ce30005164.tar.xz ibus-8db276818d12776ba0cd7819972fa5ce30005164.zip | |
Move icons to data/icons. Install schemas.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 23 | ||||
| -rw-r--r-- | data/ibus.schemas (renamed from setup/ibus.schemas) | 0 | ||||
| -rw-r--r-- | data/icons/Makefile.am (renamed from icons/Makefile.am) | 0 | ||||
| -rw-r--r-- | data/icons/engine-default.svg (renamed from icons/engine-default.svg) | 0 | ||||
| -rw-r--r-- | data/icons/ibus-help.png (renamed from icons/ibus-help.png) | bin | 13998 -> 13998 bytes | |||
| -rw-r--r-- | data/icons/ibus-keyboard.svg (renamed from icons/ibus-keyboard.svg) | 0 | ||||
| -rw-r--r-- | data/icons/ibus-locale.svg (renamed from icons/ibus-locale.svg) | 0 | ||||
| l--------- | data/icons/ibus-setup.svg (renamed from icons/ibus-setup.svg) | 0 | ||||
| -rw-r--r-- | data/icons/ibus-zh.svg (renamed from icons/ibus-zh.svg) | 0 | ||||
| -rw-r--r-- | data/icons/ibus.svg (renamed from icons/ibus.svg) | 0 |
11 files changed, 23 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 433b03e..074bb0a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,7 +29,7 @@ SUBDIRS = \ client \ setup \ bus \ - icons \ + data \ m4 \ po \ docs \ diff --git a/configure.ac b/configure.ac index 2302dd3..c40d8b0 100644 --- a/configure.ac +++ b/configure.ac @@ -101,6 +101,26 @@ PKG_CHECK_MODULES(GCONF, [gconf-2.0 >= 2.12], ) +AC_PATH_PROG(GCONFTOOL, gconftool-2, no) +if test x"$GCONFTOOL" = xno; then + AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf]) +fi + +AM_GCONF_SOURCE_2 + +# GCONF_SERVERDIR=`$PKG_CONFIG --variable=gconf_serverdir gconf-2.0` +# old_path=$PATH +# if test x"$GCONF_SERVERDIR" != x; then +# PATH=$GCONF_SERVERDIR:$PATH +# fi +# +# AC_PATH_PROG(GCONF_SANITY_CHECK, gconf-sanity-check-2, no) +# if test x"$GCONF_SANITY_CHECK" = xno; then +# AC_MSG_ERROR([gconf-sanity-check-2 executable not found in your path - should be installed with GConf]) +# fi +# +# AC_SUBST(GCONF_SANITY_CHECK) +# PATH=$old_path # Check for Qt4 PKG_CHECK_MODULES(QT, @@ -253,7 +273,8 @@ bindings/Makefile bindings/python/Makefile util/Makefile util/IMdkit/Makefile -icons/Makefile +data/Makefile +data/icons/Makefile docs/Makefile docs/reference/Makefile docs/reference/ibus/Makefile diff --git a/setup/ibus.schemas b/data/ibus.schemas index 2bd2bb5..2bd2bb5 100644 --- a/setup/ibus.schemas +++ b/data/ibus.schemas diff --git a/icons/Makefile.am b/data/icons/Makefile.am index 5a6617c..5a6617c 100644 --- a/icons/Makefile.am +++ b/data/icons/Makefile.am diff --git a/icons/engine-default.svg b/data/icons/engine-default.svg index e27018c..e27018c 100644 --- a/icons/engine-default.svg +++ b/data/icons/engine-default.svg diff --git a/icons/ibus-help.png b/data/icons/ibus-help.png Binary files differindex aff3318..aff3318 100644 --- a/icons/ibus-help.png +++ b/data/icons/ibus-help.png diff --git a/icons/ibus-keyboard.svg b/data/icons/ibus-keyboard.svg index 4a19adc..4a19adc 100644 --- a/icons/ibus-keyboard.svg +++ b/data/icons/ibus-keyboard.svg diff --git a/icons/ibus-locale.svg b/data/icons/ibus-locale.svg index 0d737d9..0d737d9 100644 --- a/icons/ibus-locale.svg +++ b/data/icons/ibus-locale.svg diff --git a/icons/ibus-setup.svg b/data/icons/ibus-setup.svg index ed6fc03..ed6fc03 120000 --- a/icons/ibus-setup.svg +++ b/data/icons/ibus-setup.svg diff --git a/icons/ibus-zh.svg b/data/icons/ibus-zh.svg index 7747876..7747876 100644 --- a/icons/ibus-zh.svg +++ b/data/icons/ibus-zh.svg diff --git a/icons/ibus.svg b/data/icons/ibus.svg index 87063a9..87063a9 100644 --- a/icons/ibus.svg +++ b/data/icons/ibus.svg |
