diff --git a/tc-git/Makefile b/tc-git/Makefile index cf03756d3f..67d9f3c387 100644 --- a/tc-git/Makefile +++ b/tc-git/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2013/10/22 13:05:16 makoto Exp $ +# $NetBSD: Makefile,v 1.3 2013/11/22 08:30:18 makoto Exp $ DISTNAME= tc-2.99.2 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} @@ -18,7 +18,7 @@ INSTALLATION_DIRS= ${EMACS_INFOPREFIX} \ EMACS_MODULES= base # Instead of USE_TOOLS+=, avoid to conflict with autoconf -USE_TOOLS= aclocal automake autoconf gmake +USE_TOOLS= aclocal automake autoconf gmake makeinfo GNU_CONFIGURE= YES CONFIGURE_ARGS+= ${CONFIGURE_ARGS.${EMACS_FLAVOR}} diff --git a/tc-git/distinfo b/tc-git/distinfo index 3256e9123b..e766e39158 100644 --- a/tc-git/distinfo +++ b/tc-git/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.3 2013/04/09 01:03:46 makoto Exp $ +$NetBSD: distinfo,v 1.4 2013/11/22 08:30:18 makoto Exp $ SHA1 (patch-BATCH-SORT) = 64a390e3ca3b5031941b45489a155da67e4e59df SHA1 (patch-bushu-util_bushu2canna) = 9573de81b6f9ef7a225fc954b618f7905e648821 SHA1 (patch-bushu-util_where) = 07bd3faf178ef57b9cc0afae20f56dbf83cc1d6d SHA1 (patch-configure.ac) = 4174e3674e2cc7dbb6daf5de56fa76f24273edf9 -SHA1 (patch-etc_Makefile.am) = b548b182497ad5e2460a2df7ee15f57d83dae71e +SHA1 (patch-etc_Makefile.am) = e31ef193cb659d88ae90a71475bc67ab5d0b810d SHA1 (patch-etc_Makefile.in) = 5d17622136ce9960dcc5dc43f4763d3e315241b1 SHA1 (patch-etc_bushu.rev) = 53259ef27da2b3e57ff9834957c8ee9b2fe4f833 SHA1 (patch-lisp_Makefile.am) = b80c93ae0ed60e8816a7cae452f5d300d9964781 diff --git a/tc-git/patches/patch-etc_Makefile.am b/tc-git/patches/patch-etc_Makefile.am index 302758bbf8..0736d8db6a 100644 --- a/tc-git/patches/patch-etc_Makefile.am +++ b/tc-git/patches/patch-etc_Makefile.am @@ -1,8 +1,8 @@ -$NetBSD: patch-etc_Makefile.am,v 1.1 2013/01/22 13:54:22 makoto Exp $ +$NetBSD: patch-etc_Makefile.am,v 1.2 2013/11/22 08:30:18 makoto Exp $ (1) To merge sybmol.rev (if configured with --enable-symbol-rev) (2) To sort bushu.exand by emacs-internal-code order -(3) Please note beggining with # line seems to be important. +(3) Please note beginning with # line seems to be important. Don't remove the line without testing functionality, thanks. --- etc/Makefile.am.orig 2011-04-24 20:50:27.000000000 +0900 @@ -27,7 +27,7 @@ $NetBSD: patch-etc_Makefile.am,v 1.1 2013/01/22 13:54:22 makoto Exp $ + echo ' *** symbol.rev will NOT be included in bushu.rev ***'; \ + fi + $(EMACS) -q -no-site-file -batch -l $(BATCH_SORT) -f batch-sort-file bushu.rev.tmp bushu.rev utf-8 utf-8 -+ # $(EMACS) -q -no-site-file -batch -l $(BATCH_SORT) -f batch-sort-file bushu.rev.tmp bushu.rev utf-8 utf-8 ++# $(EMACS) -q -no-site-file -batch -l $(BATCH_SORT) -f batch-sort-file bushu.rev.tmp bushu.rev utf-8 utf-8 + @echo ' *** compiling bushu dictionary ***' + @echo ' *** this may take a few minutes ***' $(EMACS) -q -no-site-file -batch -l $(srcdir)/mk-bdic