groff-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[groff] 01/01: refer: try to get a refer data dir created in installing


From: Bernd Warken
Subject: [groff] 01/01: refer: try to get a refer data dir created in installing - no success so far
Date: Fri, 05 Sep 2014 20:12:57 +0000

bwarken pushed a commit to branch master
in repository groff.

commit 3d6a4dcbb78a51949c379b9f68efe59198ba9b20
Author: Bernd Warken <address@hidden>
Date:   Fri Sep 5 22:10:22 2014 +0200

    refer: try to get a refer data dir created in installing - no success so far
---
 ChangeLog                      |    7 +++++++
 aclocal.m4                     |    2 +-
 configure                      |    3 ++-
 configure.ac                   |    2 +-
 m4/groff.m4                    |    9 ++++++---
 src/preproc/refer/Makefile.sub |   26 ++++++++++++++++++++++++--
 6 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b9248e1..63536a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-09-04  Bernd Warken  <address@hidden>
+
+       * m4/groff.m4, configure.ac, Makefile.in,
+       src/preproc/refer/Makefile.sub: Add information to create a refer
+       data directory by installing.  That dir is not yet generated
+       anyway.
+
 2014-09-05  Werner LEMBERG  <address@hidden>
 
        Regenerate configure files with correct parameters.
diff --git a/aclocal.m4 b/aclocal.m4
index 77cb968..8ce3594 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.14 -*- Autoconf -*-
+# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
 
 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
 
diff --git a/configure b/configure
index 970a742..b93dcc9 100755
--- a/configure
+++ b/configure
@@ -761,6 +761,7 @@ PACKAGE_TARNAME
 PACKAGE_NAME
 PATH_SEPARATOR
 SHELL
+refer_dir
 grog_dir
 gpinyin_dir
 glilypond_dir
@@ -5952,7 +5953,7 @@ $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
+GROFF_REFERDIR_DEFAULT
 { $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/configure.ac b/configure.ac
index 0ce4cc6..8c7f98d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,7 +66,7 @@ GROFF_GROGDIR_DEFAULT
 GROFF_PERL
 GROFF_PRINT
 # GROFF_REFER
-# GROFF_REFERDIR_DEFAULT
+GROFF_REFERDIR_DEFAULT
 AC_PROG_EGREP
 GROFF_PROG_YACC
 GROFF_DOC_CHECK
diff --git a/m4/groff.m4 b/m4/groff.m4
index 1fae710..54aaaf7 100644
--- a/m4/groff.m4
+++ b/m4/groff.m4
@@ -1,8 +1,7 @@
 # Autoconf macros for groff.
-# Copyright (C) 1989-1995, 2001-2007, 2009, 2011, 2013, 2014
-#   Free Software Foundation, Inc.
+# Copyright (C) 1989-2014  Free Software Foundation, Inc.
 #
-# Last update: 8 Aug 2014
+# Last update: 5 Sep 2014
 #
 # This file is part of groff.
 #
@@ -1396,3 +1395,7 @@ AC_DEFUN([GROFF_GPINYINDIR_DEFAULT],
 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]))
diff --git a/src/preproc/refer/Makefile.sub b/src/preproc/refer/Makefile.sub
index 82d6b79..2e36bec 100644
--- a/src/preproc/refer/Makefile.sub
+++ b/src/preproc/refer/Makefile.sub
@@ -2,10 +2,10 @@
 #
 # File position: <groff-source>/src/preproc/refer/Makefile.sub
 #
-# Copyright (C) 2014
+# Copyright (C) 1989-2014
 #   Free Software Foundation, Inc.
 #
-# Last update: 2 Sep 2014
+# Last update: 5 Sep 2014
 #
 # This file is part of `font utf8' which is part of `groff'.
 #
@@ -49,6 +49,28 @@ GRAM=$(srcdir)/label.y
 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
+
+.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
+
+
 ########################################################################
 # Emacs settings
 ########################################################################



reply via email to

[Prev in Thread] Current Thread [Next in Thread]