gpinyin: add new path (autogen) for sub.pl

9 files changed, 81 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index dae0082e4..1c3a3a58b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-08-08  Bernd Warken  <groff-bernd.warken-72@web.de>
+
+	* configure.ac, configure, Makefile.in, m4/groff.m4: Install paths
+	for implementing contrib/gpinyin's sub.pl.
+
 2014-08-06  Bernd Warken  <groff-bernd.warken-72@web.de>
 
 	* man/groff_char.man: Add description for displaying `uxxxx' as
diff --git a/Makefile.in b/Makefile.in
index 4290e81af..b83ad7fc4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -190,10 +190,11 @@ localtmacdir=$(dataprogramdir)/site-tmac
 # gxditview.
 appresdir=@appresdir@
 
-libprogramdir=@libprogramdir@
-groffer_dir=@groffer_dir@
 glilypond_dir=@glilypond_dir@
+gpinyin_dir=@gpinyin_dir@
+groffer_dir=@groffer_dir@
 grog_dir=@grog_dir@
+libprogramdir=@libprogramdir@
 
 # `tmacpath' says where to look for macro files.
 # The current directory will be prepended in unsafe mode only; the home
@@ -541,6 +542,7 @@ MDEFINES=\
   "YACCFLAGS=$(YACCFLAGS)" \
   "appresdir=$(appresdir)" \
   "groffer_dir=$(groffer_dir)" \
+  "gpinyin_dir=$(gpinyin_dir)" \
   "glilypond_dir=$(glilypond_dir)" \
   "grog_dir=$(grog_dir)" \
   "bindir=$(bindir)" \
diff --git a/configure b/configure
index a371c307d..3e07e5cfe 100755
--- a/configure
+++ b/configure
@@ -762,6 +762,7 @@ PACKAGE_NAME
 PATH_SEPARATOR
 SHELL
 grog_dir
+gpinyin_dir
 glilypond_dir
 libprogramdir'
 ac_subst_files=''
@@ -5560,6 +5561,8 @@ if test "x$with_grofferdir" = "x"; then
 
 glilypond_dir=$libprogramdir/glilypond
 
+gpinyin_dir=$libprogramdir/gpinyin
+
 grog_dir=$libprogramdir/grog
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
diff --git a/configure.ac b/configure.ac
index a11f879a3..ddfc81a36 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Copyright (C) 1989-1995, 2001-2007, 2009, 2011-2014
 #   Free Software Foundation, Inc.
 #
-# Last update: 29 Mar 2014
+# Last update: 8 Aug 2014
 #
 # This file is part of groff.
 #
@@ -64,6 +64,7 @@ GROFF_LIBPROGRAMDIR_DEFAULT
 GROFF_GROFFERDIR_OPTION
 GROFF_GROFFERDIR_DEFAULT
 GROFF_GLILYPONDDIR_DEFAULT
+GROFF_GPINYINDIR_DEFAULT
 GROFF_GROGDIR_DEFAULT
 GROFF_PERL
 GROFF_PRINT
diff --git a/contrib/gpinyin/ChangeLog b/contrib/gpinyin/ChangeLog
index 150d48802..882b09b97 100644
--- a/contrib/gpinyin/ChangeLog
+++ b/contrib/gpinyin/ChangeLog
@@ -1,3 +1,11 @@
+2014-08-08  Bernd Warken  <groff-bernd.warken-72@web.de>
+
+	* gpinyin.pl: Version 0.9.1
+
+	* sub.pl: New file for storing subs later on.
+
+	* Makefile.sub: Add new gpinyin path for sub.pl.
+
 2014-08-01  Bernd Warken  <groff-bernd.warken-72@web.de>
 
 	* gpinyin.pl, gpinyin.man, ChangeLog, Makefile.sub:
diff --git a/contrib/gpinyin/Makefile.sub b/contrib/gpinyin/Makefile.sub
index 2e47ad35d..3cb3f1a93 100644
--- a/contrib/gpinyin/Makefile.sub
+++ b/contrib/gpinyin/Makefile.sub
@@ -6,7 +6,7 @@
 #   Free Software Foundation, Inc.
 # Written by Bernd Warken <groff-bernd.warken-72@web.de>.
 
-# Last update: 1 Aug 2014
+# Last update: 8 Aug 2014
 
 # This file is part of `gpinyin' which is part of `groff'.
 
@@ -45,14 +45,21 @@ gpinyin: gpinyin.pl
 	chmod +x $@
 
 .PHONY: install_data
-install_data: gpinyin
-	-test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
-	$(RM) $(DESTDIR)$(bindir)/gpinyin
-	$(INSTALL_SCRIPT) gpinyin $(DESTDIR)$(bindir)/gpinyin
+install_data: gpinyin sub.pl
+	-test -d $(DESTDIR)$(bindir) \
+	|| $(mkinstalldirs) $(DESTDIR)$(bindir); \
+	$(RM) $(DESTDIR)$(bindir)/gpinyin; \
+	$(INSTALL_SCRIPT) gpinyin $(DESTDIR)$(bindir)/gpinyin; \
+        -test -d $(DESTDIR)$(gpinyin_dir) || \
+	$(mkinstalldirs) $(DESTDIR)$(gpinyin_dir); \
+	$(RM) $(DESTDIR)$(gpinyin_dir)/sub.pl; \
+        $(INSTALL_SCRIPT) $(srcdir)/sub.pl $(DESTDIR)$(gpinyin_dir)/sub.pl
 
 .PHONY: uninstall_sub
 uninstall_sub:
-	$(RM) $(DESTDIR)$(bindir)/gpinyin
+	$(RM) $(DESTDIR)$(bindir)/gpinyin; \
+        $(RM) $(DESTDIR)$(gpinyin_dir)/sub.pl; \
+	rmdir $(DESTDIR)$(gpinyin_dir)
 
 
 ########################################################################
diff --git a/contrib/gpinyin/gpinyin.pl b/contrib/gpinyin/gpinyin.pl
index c1b3ce09b..24545a3dc 100755
--- a/contrib/gpinyin/gpinyin.pl
+++ b/contrib/gpinyin/gpinyin.pl
@@ -10,8 +10,8 @@
 
 # Written by Bernd Warken <groff-bernd.warken-72@web.de>.
 
-my $Latest_Update = '1 Aug 2014';
-my $version = '0.9.0';
+my $Latest_Update = '8 Aug 2014';
+my $version = '0.9.1';
 
 # This file is part of `gpinyin', which is part of `groff'.
 
diff --git a/contrib/gpinyin/sub.pl b/contrib/gpinyin/sub.pl
new file mode 100755
index 000000000..14f7db477
--- /dev/null
+++ b/contrib/gpinyin/sub.pl
@@ -0,0 +1,38 @@
+#! /usr/bin/env perl
+
+# gpinyin - European-like Chinese writing `pinyin' into `groff'
+
+# Source file position: <groff-source>/contrib/gpinyin/gpinyin.pl
+# Installed position: <prefix>/bin/gpinyin
+
+# Copyright (C) 2014
+#   Free Software Foundation, Inc.
+
+# Written by Bernd Warken <groff-bernd.warken-72@web.de>.
+
+# Latest update: 8 Aug 2014
+
+# This file is part of `gpinyin', which is part of `groff'.
+
+# `groff' 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 of the License, or
+# (at your option) any later version.
+
+# `groff' 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 can find a copy of the GNU General Public License in the internet
+# at <http://www.gnu.org/licenses/gpl-2.0.html>.
+
+########################################################################
+
+
+1;
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: CPerl
+# End:
diff --git a/m4/groff.m4 b/m4/groff.m4
index 6021c22f3..1fae71097 100644
--- a/m4/groff.m4
+++ b/m4/groff.m4
@@ -2,7 +2,7 @@
 # Copyright (C) 1989-1995, 2001-2007, 2009, 2011, 2013, 2014
 #   Free Software Foundation, Inc.
 #
-# Last update: 29 Mar 2014
+# Last update: 8 Aug 2014
 #
 # This file is part of groff.
 #
@@ -1388,6 +1388,11 @@ AC_DEFUN([GROFF_GLILYPONDDIR_DEFAULT],
   AC_SUBST([glilypond_dir]))
 
 
+AC_DEFUN([GROFF_GPINYINDIR_DEFAULT],
+  gpinyin_dir=$libprogramdir/gpinyin
+  AC_SUBST([gpinyin_dir]))
+
+
 AC_DEFUN([GROFF_GROGDIR_DEFAULT],
   grog_dir=$libprogramdir/grog
   AC_SUBST([grog_dir]))