From a400b7b1890974a4f2860bd7eb8e1321d8311ccb Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Sun, 28 Sep 2003 10:50:41 +0000 Subject: [PATCH] 2003-09-28 Tim Waugh * configure.in: Fetch ChangeLog from srcdir, not builddir (fixes 'make distcheck'). * src/po/Makefile.am: Fetch zh_CN.po from srcdir, not builddir (fixes 'make distcheck'). svn: r2179 --- gramps2/ChangeLog | 6 ++++++ gramps2/configure.in | 2 +- gramps2/src/po/Makefile.am | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 76f5f9b7e..ebbe44a4c 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,9 @@ +2003-09-28 Tim Waugh + * configure.in: Fetch ChangeLog from srcdir, not builddir (fixes + 'make distcheck'). + * src/po/Makefile.am: Fetch zh_CN.po from srcdir, not builddir (fixes + 'make distcheck'). + 2003-09-27 Alex Roitman * doc/gramps-manual/C/filtref.xml: Manual corrections. * doc/gramps-manual/C/cmdline.xml: Likewise. diff --git a/gramps2/configure.in b/gramps2/configure.in index ebb6b851b..660c24862 100644 --- a/gramps2/configure.in +++ b/gramps2/configure.in @@ -5,7 +5,7 @@ AC_PREREQ(2.57) AC_INIT(gramps, 0.9.4, gramps-bugs@lists.sourceforge.net) AC_CONFIG_SRCDIR(src/gramps.py) AM_INIT_AUTOMAKE(1.6.3) -RELEASE=0.CVS$(head -c 10 ChangeLog | tr -d '-') +RELEASE=0.CVS$(head -c 10 ${srcdir}/ChangeLog | tr -d '-') VERSIONSTRING=$VERSION if test x"$RELEASE" != "x" diff --git a/gramps2/src/po/Makefile.am b/gramps2/src/po/Makefile.am index d863af4fb..4db6a118a 100644 --- a/gramps2/src/po/Makefile.am +++ b/gramps2/src/po/Makefile.am @@ -24,8 +24,8 @@ SUFFIXES = .po .mo $(MSGFMT) -v temp.po -o $@ rm temp.po -zh_CN.mo: zh_CN.po - iconv -f GB2312 -t UTF-8 zh_CN.po > temp.po +zh_CN.mo: $(top_srcdir)/src/po/zh_CN.po + iconv --from-code=GB2312 --to-code=UTF-8 $< -o temp.po $(MSGFMT) -v temp.po -o $@ rm temp.po