[groff] 01/01: Fix build issues.

[Werner LEMBERG]

wl pushed a commit to branch master
in repository groff.

commit fa2ac853fa758a25356fc019cb64274cce0191dd
Author: Werner Lemberg <address@hidden>
Date:   Sat Sep 6 00:14:26 2014 +0200

    Fix build issues.
    
    * m4/groff.m4: Fix typo.
    s/refer_dir/referdir/ for consistency.
    
    * configure: Regenerated.
    
    * Makefile.in: s/refer_dir/referdir/ for consistency.
    
    * src/preproc/refer/Makefile.sub (install_data, uninstall_sub):
    Don't handle binaries or manpages; this is handled elsewhere
    already.  Right now, only install and uninstall the `refer' data
    directory.
---
 ChangeLog                      |   16 ++++++++++++++++
 Makefile.in                    |    4 ++--
 configure                      |    9 ++++-----
 m4/groff.m4                    |    6 +++---
 src/preproc/refer/Makefile.sub |   20 ++++----------------
 5 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f17e1eb..8658c1c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2014-09-06  Werner LEMBERG  <address@hidden>
+
+       Fix build issues.
+
+       * m4/groff.m4: Fix typo.
+       s/refer_dir/referdir/ for consistency.
+
+       * configure: Regenerated.
+
+       * Makefile.in: s/refer_dir/referdir/ for consistency.
+
+       * src/preproc/refer/Makefile.sub (install_data, uninstall_sub):
+       Don't handle binaries or manpages; this is handled elsewhere
+       already.  Right now, only install and uninstall the `refer' data
+       directory.
+
 2014-09-04  Bernd Warken  <address@hidden>
 
        * configure: When I change the `configure' file manually, the
diff --git a/Makefile.in b/Makefile.in
index 2d4c304..b5edae1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -192,7 +192,7 @@ address@hidden@
 address@hidden@
 address@hidden@
 address@hidden@
address@hidden@
address@hidden@
 
 # `tmacpath' says where to look for macro files.
 # The current directory will be prepended in unsafe mode only; the home
@@ -543,7 +543,7 @@ MDEFINES=\
   "gpinyin_dir=$(gpinyin_dir)" \
   "glilypond_dir=$(glilypond_dir)" \
   "grog_dir=$(grog_dir)" \
-  "refer_dir=$(refer_dir)" \
+  "referdir=$(referdir)" \
   "bindir=$(bindir)" \
   "common_words_file=$(common_words_file)" \
   "datadir=$(datadir)" \
diff --git a/configure b/configure
index 4c54047..bf5d296 100755
--- a/configure
+++ b/configure
@@ -5,7 +5,7 @@
 # Report bugs to <address@hidden>.
 #
 #
-# Copyright (C) 1992-2014 Free Software Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -761,7 +761,7 @@ PACKAGE_TARNAME
 PACKAGE_NAME
 PATH_SEPARATOR
 SHELL
-refer_dir
+referdir
 grog_dir
 gpinyin_dir
 glilypond_dir
@@ -5566,8 +5566,6 @@ gpinyin_dir=$libprogramdir/gpinyin
 
 grog_dir=$libprogramdir/grog
 
-refer_dir=$libprogramdir/refer
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not 
truncate output" >&5
 $as_echo_n "checking for a sed that does not truncate output... " >&6; }
 if ${ac_cv_path_SED+:} false; then :
@@ -5955,7 +5953,8 @@ $as_echo_n "checking for command to use for printing dvi 
files... " >&6; }
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DVIPRINT" >&5
 $as_echo "$DVIPRINT" >&6; }
 # GROFF_REFER
-# GROFF_REFERDIR_DEFAULT
+referdir=$libprogramdir/refer
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 $as_echo_n "checking for egrep... " >&6; }
 if ${ac_cv_path_EGREP+:} false; then :
diff --git a/m4/groff.m4 b/m4/groff.m4
index 54aaaf7..749034f 100644
--- a/m4/groff.m4
+++ b/m4/groff.m4
@@ -1396,6 +1396,6 @@ AC_DEFUN([GROFF_GROGDIR_DEFAULT],
   grog_dir=$libprogramdir/grog
   AC_SUBST([grog_dir]))
 
-AC_DEFUN([GROFF_REFER_DEFAULT],
-  refer_dir=$libprogramdir/refer
-  AC_SUBST([refer_dir]))
+AC_DEFUN([GROFF_REFERDIR_DEFAULT],
+  referdir=$libprogramdir/refer
+  AC_SUBST([referdir]))
diff --git a/src/preproc/refer/Makefile.sub b/src/preproc/refer/Makefile.sub
index 2e36bec..ce0de02 100644
--- a/src/preproc/refer/Makefile.sub
+++ b/src/preproc/refer/Makefile.sub
@@ -50,25 +50,13 @@ YTABC=label.cpp
 NAMEPREFIX=$(g)
 
 .PHONY: install_data
-install_data: refer $(MAN1)
-       -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
-       $(RM) $(DESTDIR)$(bindir)/refer
-       $(INSTALL_SCRIPT) refer $(DESTDIR)$(bindir)/refer
-       -test -d $(DESTDIR)$(refer_dir) ||
-         $(mkinstalldirs) $(DESTDIR)$(refer_dir)
-       for f in $(MAN1); do \
-         $(RM) $(DESTDIR)$(refer_dir)/$$f; \
-         $(INSTALL_SCRIPT) $(srcdir)/$$f $(DESTDIR)$(refer_dir)/$$f; \
-       done
+install_data: refer
+       -test -d $(DESTDIR)$(referdir) \
+         || $(mkinstalldirs) $(DESTDIR)$(referdir)
 
 .PHONY: uninstall_data
 uninstall_sub:
-       $(RM) $(DESTDIR)$(bindir)/refer
-       -for f in $(MAN1); do \
-         $(RM) $(DESTDIR)$(refer_dir)/$$f; \
-       done
-       -d=$(DESTDIR)$(refer_dir);\
-         if test -d $$d; then rmdir $$d; fi
+       -rmdir $(DESTDIR)$(referdir)
 
 
 ########################################################################