[groff] 77/80: Rename Makefile macro DEVICE to DEFAULT

groff-commit
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[groff] 77/80: Rename Makefile macro DEVICE to DEFAULT_DEVICE.

From:	G. Branden Robinson
Subject:	[groff] 77/80: Rename Makefile macro DEVICE to DEFAULT_DEVICE.
Date:	Sat, 30 Nov 2024 04:02:30 -0500 (EST)
gbranden pushed a commit to branch master
in repository groff.

commit 94fd78ef12e6c11622f7b4ff89aa777e3e8ba2e3
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Sat Nov 30 01:18:48 2024 -0600

    Rename Makefile macro DEVICE to DEFAULT_DEVICE.
    
    * Makefile.am: Do it.
    
    * src/include/include.am (defs.h):
    * src/libs/libgroff/device.cpp:
    * src/devices/grodvi/grodvi.1.man:
    * src/devices/grohtml/grohtml.1.man:
    * src/devices/grolbp/grolbp.1.man:
    * src/devices/grolj4/grolj4.1.man:
    * src/devices/gropdf/gropdf.1.man:
    * src/devices/grops/grops.1.man:
    * src/devices/grotty/grotty.1.man:
    * src/preproc/eqn/eqn.1.man:
    * src/preproc/grn/grn.1.man:
    * src/roff/groff/groff.1.man:
    * src/roff/troff/troff.1.man: Reflect rename.
    
    * NEWS: Add item.
---
 ChangeLog                         | 21 +++++++++++++++++++++
 Makefile.am                       |  7 ++++---
 NEWS                              |  3 +++
 contrib/mm/ChangeLog              |  5 +++++
 contrib/mm/Makefile.sim           |  2 +-
 contrib/mom/groff_mom.7.man       |  2 +-
 src/devices/grodvi/grodvi.1.man   |  2 +-
 src/devices/grohtml/grohtml.1.man |  2 +-
 src/devices/grolbp/grolbp.1.man   |  2 +-
 src/devices/grolj4/grolj4.1.man   |  2 +-
 src/devices/gropdf/gropdf.1.man   |  2 +-
 src/devices/grops/grops.1.man     |  2 +-
 src/devices/grotty/grotty.1.man   |  2 +-
 src/include/include.am            |  2 +-
 src/libs/libgroff/device.cpp      |  3 ++-
 src/preproc/eqn/eqn.1.man         |  2 +-
 src/preproc/grn/grn.1.man         |  2 +-
 src/roff/groff/groff.1.man        |  4 ++--
 src/roff/troff/troff.1.man        |  4 ++--
 19 files changed, 51 insertions(+), 20 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 58d97d416..1e555326f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2024-11-30  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       Rename Makefile macro `DEVICE` to `DEFAULT_DEVICE`.
+
+       * Makefile.am: Do it.
+       * src/include/include.am (defs.h):
+       * src/libs/libgroff/device.cpp:
+       * src/devices/grodvi/grodvi.1.man:
+       * src/devices/grohtml/grohtml.1.man:
+       * src/devices/grolbp/grolbp.1.man:
+       * src/devices/grolj4/grolj4.1.man:
+       * src/devices/gropdf/gropdf.1.man:
+       * src/devices/grops/grops.1.man:
+       * src/devices/grotty/grotty.1.man:
+       * src/preproc/eqn/eqn.1.man:
+       * src/preproc/grn/grn.1.man:
+       * src/roff/groff/groff.1.man:
+       * src/roff/troff/troff.1.man: Reflect rename.
+
+       * NEWS: Add item.
+
 2024-11-30  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        [indxbib]: Align with modern groff conventions.
diff --git a/Makefile.am b/Makefile.am
index 43b9d0630..5feef38a0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -74,8 +74,9 @@ SH_SEP=@PATH_SEPARATOR@
 # %!PS-Adobe-2.0 rather than %!PS-Adobe-3.0; this is needed when using
 # Sun's Newsprint with a printer that requires page reversal.
 
-# 'DEVICE' is the default output device.
-DEVICE=ps
+# 'DEFAULT_DEVICE' is the output device troff uses when not given a `-T`
+# command-line option.
+DEFAULT_DEVICE=ps
 
 # 'XPROGDIRS' is either "src/devices/xditview src/utils/xtotroff" or
 # empty.
@@ -846,7 +847,7 @@ SUFFIXES += .man
             -e "s|[@]DATASUBDIR[@]|`echo $(datasubdir) | sed -f 
$(makevarescape)`|g" \
             -e "s|[@]DEFAULT_INDEX[@]|`echo $(indexdir)/$(indexname) | sed -f 
$(makevarescape)`|g" \
             -e "s|[@]DEFAULT_INDEX_NAME[@]|`echo $(indexname) | sed -f 
$(makevarescape)`|g" \
-            -e "s|[@]DEVICE[@]|\\\\%$(DEVICE)|g" \
+            -e "s|[@]DEFAULT_DEVICE[@]|\\\\%$(DEFAULT_DEVICE)|g" \
             -e "s|[@]DOCDIR[@]|`echo $(docdir) | sed -f $(makevarescape)`|g" \
             -e "s|[@]EXAMPLEDIR[@]|`echo $(exampledir) | sed -f 
$(makevarescape)`|g" \
             -e "s|[@]FONTDIR[@]|`echo $(fontdir) | sed -f $(makevarescape)`|g" 
\
diff --git a/NEWS b/NEWS
index 91f64e258..2393fc366 100644
--- a/NEWS
+++ b/NEWS
@@ -652,6 +652,9 @@ Miscellaneous
    pnmcut(1).  Per upstream, the former was introduced 23 years ago and
    the latter withdrawn 15 years ago.
 
+*  The Makefile macro `DEVICE` has been renamed to `DEFAULT_DEVICE`; be
+   aware if your builds don't use "ps" as the default output device.
+
 *  The groff_diff(7) man page no longer contains examples.  They remain
    in groff's Texinfo manual.
 
diff --git a/contrib/mm/ChangeLog b/contrib/mm/ChangeLog
index 2a8ecd6a9..647ba5116 100644
--- a/contrib/mm/ChangeLog
+++ b/contrib/mm/ChangeLog
@@ -1,3 +1,8 @@
+2024-11-30  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * Makefile.sim: Rename Makefile macro `DEVICE` to
+       `DEFAULT_DEVICE`.
+
 2024-11-07  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        Refactor date format localization.
diff --git a/contrib/mm/Makefile.sim b/contrib/mm/Makefile.sim
index 2d2d6b628..3d353adfe 100644
--- a/contrib/mm/Makefile.sim
+++ b/contrib/mm/Makefile.sim
@@ -60,7 +60,7 @@ uninstall: groff_mm.n groff_mmse.n
             -e "s|@FONTPATH@|$(fontpath)|g" \
             -e "s|@MACRODIR@|$(tmacdir)|g" \
             -e "s|@MACROPATH@|$(tmacpath)|g" \
-            -e "s|@DEVICE@|$(DEVICE)|g" \
+            -e "s|@DEFAULT_DEVICE@|$(DEFAULT_DEVICE)|g" \
             -e "s|@DEFAULT_INDEX@|$(indexdir)/$(indexname)|g" \
             -e "s|@DEFAULT_INDEX_NAME@|$(indexname)|g" \
             -e "s|@INDEX_SUFFIX@|$(indexext)|g" \
diff --git a/contrib/mom/groff_mom.7.man b/contrib/mom/groff_mom.7.man
index 97d6acc50..391358487 100644
--- a/contrib/mom/groff_mom.7.man
+++ b/contrib/mom/groff_mom.7.man
@@ -169,7 +169,7 @@ format for the device specified with the
 option.
 .
 (In this installation,
-.B @DEVICE@
+.B @DEFAULT_DEVICE@
 is the default output device.)
 .
 .
diff --git a/src/devices/grodvi/grodvi.1.man b/src/devices/grodvi/grodvi.1.man
index dd8c4f266..a088282ec 100644
--- a/src/devices/grodvi/grodvi.1.man
+++ b/src/devices/grodvi/grodvi.1.man
@@ -110,7 +110,7 @@ when the latter is given the
 option.
 .
 (In this installation,
-.B @DEVICE@
+.B @DEFAULT_DEVICE@
 is the default output device.)
 .
 Use
diff --git a/src/devices/grohtml/grohtml.1.man 
b/src/devices/grohtml/grohtml.1.man
index 6b2ee1c68..2d2dc371b 100644
--- a/src/devices/grohtml/grohtml.1.man
+++ b/src/devices/grohtml/grohtml.1.man
@@ -153,7 +153,7 @@ or
 options.
 .
 (In this installation,
-.B @DEVICE@
+.B @DEFAULT_DEVICE@
 is the default output device.)
 .
 Use
diff --git a/src/devices/grolbp/grolbp.1.man b/src/devices/grolbp/grolbp.1.man
index e17ab043c..7f585abe6 100644
--- a/src/devices/grolbp/grolbp.1.man
+++ b/src/devices/grolbp/grolbp.1.man
@@ -128,7 +128,7 @@ when the latter is given the
 option.
 .
 (In this installation,
-.B @DEVICE@
+.B @DEFAULT_DEVICE@
 is the default output device.)
 .
 Use
diff --git a/src/devices/grolj4/grolj4.1.man b/src/devices/grolj4/grolj4.1.man
index 9db021060..fca9bb800 100644
--- a/src/devices/grolj4/grolj4.1.man
+++ b/src/devices/grolj4/grolj4.1.man
@@ -110,7 +110,7 @@ when the latter is given the
 option.
 .
 (In this installation,
-.B @DEVICE@
+.B @DEFAULT_DEVICE@
 is the default output device.)
 .
 Use
diff --git a/src/devices/gropdf/gropdf.1.man b/src/devices/gropdf/gropdf.1.man
index fea9ac00b..637ae16ff 100644
--- a/src/devices/gropdf/gropdf.1.man
+++ b/src/devices/gropdf/gropdf.1.man
@@ -116,7 +116,7 @@ when the latter is given the
 option.
 .
 (In this installation,
-.B @DEVICE@
+.B @DEFAULT_DEVICE@
 is the default output device.)
 .
 Use
diff --git a/src/devices/grops/grops.1.man b/src/devices/grops/grops.1.man
index cd33a2a28..b60a49469 100644
--- a/src/devices/grops/grops.1.man
+++ b/src/devices/grops/grops.1.man
@@ -115,7 +115,7 @@ when the latter is given the
 option.
 .
 (In this installation,
-.B @DEVICE@
+.B @DEFAULT_DEVICE@
 is the default output device.)
 .
 Use
diff --git a/src/devices/grotty/grotty.1.man b/src/devices/grotty/grotty.1.man
index f53747dd3..6ff91e733 100644
--- a/src/devices/grotty/grotty.1.man
+++ b/src/devices/grotty/grotty.1.man
@@ -110,7 +110,7 @@ or
 options.
 .
 (In this installation,
-.B @DEVICE@
+.B @DEFAULT_DEVICE@
 is the default output device.)
 .
 Use
diff --git a/src/include/include.am b/src/include/include.am
index ca32d6d04..eb8f402c9 100644
--- a/src/include/include.am
+++ b/src/include/include.am
@@ -23,7 +23,7 @@ CLEANFILES += defs.h
 defs.h: config.status
        @$(SHELL) $(top_srcdir)/gendef.sh defs.h \
        "PROG_PREFIX=\"$(g)\"" \
-       "DEVICE=\"$(DEVICE)\"" \
+       "DEFAULT_DEVICE=\"$(DEFAULT_DEVICE)\"" \
        "INSTALLPATH=\"$(prefix)\"" \
        "BINPATH=\"$(bindir)\"" \
        "FONTPATH=\"$(fontpath)\"" \
diff --git a/src/libs/libgroff/device.cpp b/src/libs/libgroff/device.cpp
index be21d6a45..6fd6006af 100644
--- a/src/libs/libgroff/device.cpp
+++ b/src/libs/libgroff/device.cpp
@@ -21,10 +21,11 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>. */
 #endif
 
 #include <stdlib.h>
+
 #include "device.h"
 #include "defs.h"
 
-const char *device = DEVICE;
+const char *device = DEFAULT_DEVICE;
 
 struct device_init {
   device_init();
diff --git a/src/preproc/eqn/eqn.1.man b/src/preproc/eqn/eqn.1.man
index 8977ac988..86cfe57e4 100644
--- a/src/preproc/eqn/eqn.1.man
+++ b/src/preproc/eqn/eqn.1.man
@@ -1903,7 +1903,7 @@ is not loaded.
 .\" XXX: why NOT load eqnrc?
 .
 The default device is
-.BR @DEVICE@ .
+.BR @DEFAULT_DEVICE@ .
 .
 .
 .\" ====================================================================
diff --git a/src/preproc/grn/grn.1.man b/src/preproc/grn/grn.1.man
index 8affd0689..11727ce23 100644
--- a/src/preproc/grn/grn.1.man
+++ b/src/preproc/grn/grn.1.man
@@ -935,7 +935,7 @@ Prepare device output using output driver
 .IR dev .
 .
 The default is
-.BR @DEVICE@ .
+.BR @DEFAULT_DEVICE@ .
 .
 See
 .MR groff @MAN1EXT@
diff --git a/src/roff/groff/groff.1.man b/src/roff/groff/groff.1.man
index 61185b8af..0129c862d 100644
--- a/src/roff/groff/groff.1.man
+++ b/src/roff/groff/groff.1.man
@@ -1377,7 +1377,7 @@ If neither this option nor the
 .I \%GROFF_TYPESETTER
 environment variable is used,
 the default output device is
-.BR @DEVICE@ .
+.BR @DEFAULT_DEVICE@ .
 .
 An output device may be any of the following.
 .
@@ -1909,7 +1909,7 @@ commands use temporary files.
 Set the default output device.
 .
 If empty or not set,
-.B @DEVICE@
+.B @DEFAULT_DEVICE@
 is used.
 .
 The
diff --git a/src/roff/troff/troff.1.man b/src/roff/troff/troff.1.man
index b75028493..3cb4177ad 100644
--- a/src/roff/troff/troff.1.man
+++ b/src/roff/troff/troff.1.man
@@ -467,7 +467,7 @@ Prepare output for device
 .I dev.
 .
 The default is
-.BR @DEVICE@ ;
+.BR @DEFAULT_DEVICE@ ;
 see
 .MR groff @MAN1EXT@ .
 .
@@ -881,7 +881,7 @@ after them.
 Set the default output device.
 .
 If empty or not set,
-.B @DEVICE@
+.B @DEFAULT_DEVICE@
 is used.
 .
 The
[Prev in Thread]
Current Thread
[Next in Thread]
[groff] 77/80: Rename Makefile macro DEVICE to DEFAULT_DEVICE., G. Branden Robinson <=
Prev by Date: [groff] 54/80: [libgroff]: Drop internal getopt implementation.
Next by Date: [groff] 04/80: m4/groff.m4: Search harder for an m4(1) program.
Previous by thread: [groff] 54/80: [libgroff]: Drop internal getopt implementation.
Next by thread: [groff] 04/80: m4/groff.m4: Search harder for an m4(1) program.
Index(es):
- Date
- Thread