diff options
| author | Peng Huang <shawn.p.huang@gmail.com> | 2012-08-07 10:52:01 -0400 |
|---|---|---|
| committer | Peng Huang <shawn.p.huang@gmail.com> | 2012-08-07 10:52:01 -0400 |
| commit | b2e3eb038562d68c6c20b3c6fa5362966b625058 (patch) | |
| tree | ddb4ef28233b3ca9064ab5d0d1351e8255101bc8 | |
| parent | 7d4a2f50289f7aa11b058048d3e5674884135f09 (diff) | |
| download | ibus-pinyin-b2e3eb038562d68c6c20b3c6fa5362966b625058.tar.gz | |
Fix make dist & rpm errors.
BUG=None
Review URL: https://codereview.appspot.com/6455076
| -rw-r--r-- | data/Makefile.am | 12 | ||||
| -rw-r--r-- | ibus-pinyin.spec.in | 7 |
2 files changed, 13 insertions, 6 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 9b896c0..f70f169 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -36,10 +36,16 @@ $(desktop_in_files): %.desktop.in: %.desktop.in.in Makefile -e "s|\@pkgdatadir\@|$(pkgdatadir)|" \ $< > $@.tmp && mv $@.tmp $@ -desktopdir=$(datadir)/applications -desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) +desktop_files = $(desktop_in_files:.desktop.in=.desktop) + +desktopdir = $(datadir)/applications +desktop_DATA = $(desktop_files) + +EXTRA_DIST = $(desktop_in_in_files) @INTLTOOL_DESKTOP_RULE@ CLEANFILES = \ - $(desktop_DATA) + $(desktop_files) \ + $(desktop_in_files) \ + $(NULL) diff --git a/ibus-pinyin.spec.in b/ibus-pinyin.spec.in index 72720c7..c533fa2 100644 --- a/ibus-pinyin.spec.in +++ b/ibus-pinyin.spec.in @@ -47,13 +47,14 @@ rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING README -%{_libexecdir}/ibus-engine-pinyin -%{_libexecdir}/ibus-setup-pinyin +%dir %{_datadir}/@PACKAGE@ %{_datadir}/@PACKAGE@/phrases.txt %{_datadir}/@PACKAGE@/icons %{_datadir}/@PACKAGE@/setup -%dir %{_datadir}/@PACKAGE@ +%{_datadir}/applications/* %{_datadir}/ibus/component/* +%{_libexecdir}/ibus-engine-pinyin +%{_libexecdir}/ibus-setup-pinyin %changelog * Fri Aug 08 2008 Peng Huang <shawn.p.huang@gmail.com> - @VERSION@-1 |