[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[groff] 01/07: grog: Clean up after aggressive refactor.
From: |
G. Branden Robinson |
Subject: |
[groff] 01/07: grog: Clean up after aggressive refactor. |
Date: |
Fri, 11 Jun 2021 01:31:03 -0400 (EDT) |
gbranden pushed a commit to branch master
in repository groff.
commit ebb50cac64f95eec2d9b435d3ea78c6b0f76317a
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Tue Jun 8 20:35:29 2021 +1000
grog: Clean up after aggressive refactor.
* Makefile.am: Delete references to $(grog_dir).
* configure.ac: Delete call of `GROFF_GROGDIR_DEFAULT` macro.
* m4/groff.m4: Delete definition of same.
* src/roff/grog/grog.am (grogdir): Drop variable.
(grog): Remove sed expression replacing `@grog_dir@` with
`$(grog_dir)` in grog.pl.
---
ChangeLog | 9 +++++++--
Makefile.am | 4 ----
configure.ac | 1 -
m4/groff.m4 | 4 ----
src/roff/grog/grog.am | 4 ----
5 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 677a796..a18a7a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,8 +8,13 @@
the code in the latter was dedicated to trying to locate
subs.pl.
- * src/roff/grog/grog.am (GROG, dist_grog_DATA): Drop variables.
- (grog): Remove target's dependency on `$(GROG)`.
+ * Makefile.am: Delete references to $(grog_dir).
+ * configure.ac: Delete call of `GROFF_GROGDIR_DEFAULT` macro.
+ * m4/groff.m4: Delete definition of same.
+ * src/roff/grog/grog.am (GROG, dist_grog_DATA, grogdir): Drop
+ variables.
+ (grog): Remove target's dependency on `$(GROG)`. Remove sed
+ expression replacing `@grog_dir@` with `$(grog_dir)` in grog.pl.
* src/roff/grog/grog.pl: Inline most of subs.pl (except for
author/license comment banenr). Delete sub-hunting logic.
* src/roff/grog/subs.pl: Delete.
diff --git a/Makefile.am b/Makefile.am
index aec1bae..b9fd69b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -200,7 +200,6 @@ localtmacdir=$(dataprogramdir)/site-tmac
# gxditview.
# glilypond_dir
-# grog_dir
# gpinyin_dir
# `tmacpath' says where to look for macro files.
@@ -795,9 +794,6 @@ uninstall_groffdirs:
fi; \
rmdir $(DESTDIR)$(dataprogramdir); \
fi
- if test -d $(DESTDIR)$(grog_dir); then \
- rmdir $(DESTDIR)$(grog_dir); \
- fi
if test -d $(DESTDIR)$(libprogramdir); then \
if test -d $(DESTDIR)$(systemtmacdir); then \
rm -f $(DESTDIR)$(systemtmacdir)/*; \
diff --git a/configure.ac b/configure.ac
index 08b7af0..3e3324a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,7 +59,6 @@ GROFF_APPRESDIR_DEFAULT
GROFF_LIBPROGRAMDIR_DEFAULT
GROFF_GLILYPONDDIR_DEFAULT
GROFF_GPINYINDIR_DEFAULT
-GROFF_GROGDIR_DEFAULT
GROFF_PERL
GROFF_PRINT
# GROFF_REFER
diff --git a/m4/groff.m4 b/m4/groff.m4
index 7c6e6d0..a0218e7 100644
--- a/m4/groff.m4
+++ b/m4/groff.m4
@@ -1656,10 +1656,6 @@ AC_DEFUN([GROFF_GPINYINDIR_DEFAULT],
AC_SUBST([gpinyin_dir]))
-AC_DEFUN([GROFF_GROGDIR_DEFAULT],
- grog_dir=$libprogramdir/grog
- AC_SUBST([grog_dir]))
-
AC_DEFUN([GROFF_REFERDIR_DEFAULT],
referdir=$libprogramdir/refer
AC_SUBST([referdir]))
diff --git a/src/roff/grog/grog.am b/src/roff/grog/grog.am
index a052c5c..b849704 100644
--- a/src/roff/grog/grog.am
+++ b/src/roff/grog/grog.am
@@ -19,9 +19,6 @@
grog_srcdir = $(top_srcdir)/src/roff/grog
bin_SCRIPTS += grog
-
-# grog_dir is defined by a m4 macro
-grogdir = $(grog_dir)
man1_MANS += src/roff/grog/grog.1
EXTRA_DIST += \
src/roff/grog/grog.1.man \
@@ -38,7 +35,6 @@ grog: $(grog_srcdir)/grog.pl $(SH_DEPS_SED_SCRIPT)
-e "s|[@]libdir[@]|$(DESTDIR)$(libdir)|g" \
-e "s|[@]EGREP[@]|$(EGREP)|g" \
-e "s|[@]VERSION[@]|$(VERSION)|" \
- -e "s|[@]grog_dir[@]|$(grog_dir)|" \
-e "$(SH_SCRIPT_SED_CMD)" \
$(grog_srcdir)/grog.pl \
>$@ \
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [groff] 01/07: grog: Clean up after aggressive refactor.,
G. Branden Robinson <=