diff options
| -rw-r--r-- | ChangeLog | 25 | ||||
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | PROBLEMS | 2 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | doc/automake.mom | 12 | ||||
| -rw-r--r-- | m4/groff.m4 | 38 | ||||
| -rw-r--r-- | src/devices/xditview/gxditview.1.man | 4 | ||||
| -rw-r--r-- | src/devices/xditview/xditview.am | 12 | ||||
| -rw-r--r-- | src/roff/groff/groff.1.man | 4 |
10 files changed, 71 insertions, 43 deletions
@@ -1,5 +1,30 @@ 2022-06-01 G. Branden Robinson <g.branden.robinson@gmail.com> + * configure.ac: + * m4/groff.m4 (GROFF_APPDEFDIR_OPTION, GROFF_APPDEFDIR_DEFAULT, + GROFF_APPDEFDIR_CHECK): Rename m4 macros and shell variable from + "*appres*" to "*appdef*. Update interpolation sites. + + * configure.ac: + * m4/groff.m4 (GROFF_APPDEFDIR_CHECK): Further rename this... + (GROFF_APPDEFDIR_NOTICE): ...to this, for consistency with other + post-report output macros. + + * Makefile.am: + * PROBLEMS: + * doc/automake.mom: + * src/devices/xditview/xditview.am: Update interpolation sites + of `appresdir`. + + * Makefile.am: + * src/devices/xditview/gxditview.1.man: + * src/roff/groff/groff.1.man: Update interpolation sites of + `APPRESDIR`. + + * NEWS: Add item. + +2022-06-01 G. Branden Robinson <g.branden.robinson@gmail.com> + * m4/groff.m4 (GROFF_X11, GROFF_UCHARDET): Drop redundant messages (which are easily overlooked amid the torrent of "checking" output anyway). Discovery failures of X11 and the diff --git a/Makefile.am b/Makefile.am index 33c63f781..645b310e5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -195,8 +195,8 @@ systemtmacdir=$(libprogramdir)/site-tmac # `localtmacdir' says where local files will be installed. localtmacdir=$(dataprogramdir)/site-tmac -# appresdir -# `appresdir' says where to install the application resource file for +# appdefdir +# `appdefdir' says where to install the application defaults file for # gxditview. # glilypond_dir @@ -858,7 +858,7 @@ SUFFIXES += .man $(AM_V_GEN)rm -f $@ \ && $(MKDIR_P) `dirname $@` \ && LC_ALL=C \ - sed -e "s|[@]APPRESDIR[@]|`echo $(appresdir) | sed -f $(makevarescape)`|g" \ + sed -e "s|[@]APPDEFDIR[@]|`echo $(appdefdir) | sed -f $(makevarescape)`|g" \ -e "s|[@]BINDIR[@]|`echo $(bindir) | sed -f $(makevarescape)`|g" \ -e "s|[@]COMMON_WORDS_FILE[@]|`echo $(common_words_file) | sed -f $(makevarescape)`|g" \ -e "s|[@]DATASUBDIR[@]|`echo $(datasubdir) | sed -f $(makevarescape)`|g" \ @@ -451,6 +451,9 @@ o New 'configure' options --{en,dis}able-groff-allocator control whether configure --enable-groff-allocator to re-enable groff's traditional allocator. +o The 'configure' option '--with-appresdir' has been renamed to + '--with-appdefdir'. + o Italian language input documents are now supported, including hyphenation patterns from the hyph-utf8 project and localized strings for the ms, me, mm, and mom packages. Thanks to Edmond Orignac. @@ -479,7 +479,7 @@ Make sure that the paper size is `letter'. See groff_tmac(5). This error means you haven't correctly installed the application defaults file, GXditview.ad; `make install' does this for you automatically, so either you didn't do `make install', or you haven't -passed a good `--appresdir=<DIR>' argument to groff's configure +passed a good `--appdefdir=<DIR>' argument to groff's configure script. See the X(7) man page for information how and where application diff --git a/configure.ac b/configure.ac index 8813aff58..a6d26dcab 100644 --- a/configure.ac +++ b/configure.ac @@ -55,8 +55,8 @@ GROFF_EBCDIC GROFF_OS390 GROFF_CMD_FILES GROFF_X11 -GROFF_APPRESDIR_OPTION -GROFF_APPRESDIR_DEFAULT +GROFF_APPDEFDIR_OPTION +GROFF_APPDEFDIR_DEFAULT GROFF_LIBPROGRAMDIR_DEFAULT GROFF_GLILYPONDDIR_DEFAULT GROFF_GPINYINDIR_DEFAULT @@ -235,7 +235,7 @@ then else echo "\ X11 support : enabled - X11 app defaults directory : $appresdir" + X11 app defaults directory : $appdefdir" fi echo "\ 'groff -l' uses print spooler : $groff_have_spooler @@ -245,7 +245,7 @@ echo "\ echo "\ ----------------------------------------------------------------------" -GROFF_APPRESDIR_CHECK +GROFF_APPDEFDIR_NOTICE GROFF_URW_FONTS_NOTICE GROFF_UCHARDET_NOTICE GROFF_GHOSTSCRIPT_VERSION_NOTICE diff --git a/doc/automake.mom b/doc/automake.mom index 431079743..5462b1f02 100644 --- a/doc/automake.mom +++ b/doc/automake.mom @@ -730,15 +730,15 @@ uninstall-local: uninstall_xditview .SP [...] install_xditview: $(xditview_srcdir)/GXditview.ad - -test -d $(DESTDIR)$(appresdir) \\ - || $(mkinstalldirs) $(DESTDIR)$(appresdir) - if test -f $(DESTDIR)$(appresdir)/GXditview; then \\ - mv $(DESTDIR)$(appresdir)/GXditview \\ - $(DESTDIR)$(appresdir)/GXditview.old; \\ + -test -d $(DESTDIR)$(appdefdir) \\ + || $(mkinstalldirs) $(DESTDIR)$(appdefdir) + if test -f $(DESTDIR)$(appdefdir)/GXditview; then \\ + mv $(DESTDIR)$(appdefdir)/GXditview \\ + $(DESTDIR)$(appdefdir)/GXditview.old; \\ fi [...] $(INSTALL_DATA) $(xditview_srcdir)/GXditview.ad \\ - $(DESTDIR)$(appresdir)/GXditview + $(DESTDIR)$(appdefdir)/GXditview .CODE OFF .QUOTE OFF .PP diff --git a/m4/groff.m4 b/m4/groff.m4 index 9c2cb224c..e6f2edfec 100644 --- a/m4/groff.m4 +++ b/m4/groff.m4 @@ -1550,12 +1550,12 @@ AC_DEFUN([GROFF_X11], [ ]) -# Set up the '--with-appresdir' command-line option. +# Set up the '--with-appdefdir' command-line option. # Don't quote AS_HELP_STRING! -AC_DEFUN([GROFF_APPRESDIR_OPTION], - [AC_ARG_WITH([appresdir], - AS_HELP_STRING([--with-appresdir=DIR], +AC_DEFUN([GROFF_APPDEFDIR_OPTION], + [AC_ARG_WITH([appdefdir], + AS_HELP_STRING([--with-appdefdir=DIR], [X11 application defaults files]))]) @@ -1564,41 +1564,41 @@ AC_DEFUN([GROFF_APPRESDIR_OPTION], # We ignore the 'XAPPLRES' and 'XUSERFILESEARCHPATH' environment # variables. # -# By default if --with-appresdir is not used, we will install the +# By default if --with-appdefdir is not used, we will install the # gxditview application defaults in $prefix/lib/X11/app-defaults. # -# Note that if --with-appresdir was passed to 'configure', no prefix is -# added to 'appresdir'. +# Note that if --with-appdefdir was passed to 'configure', no prefix is +# added to 'appdefdir'. -AC_DEFUN([GROFF_APPRESDIR_DEFAULT], +AC_DEFUN([GROFF_APPDEFDIR_DEFAULT], [if test -z "$groff_no_x"; then - if test -z "$with_appresdir"; then + if test -z "$with_appdefdir"; then if test "$prefix" = NONE; then - appresdir=$ac_default_prefix/lib/X11/app-defaults + appdefdir=$ac_default_prefix/lib/X11/app-defaults else - appresdir=$prefix/lib/X11/app-defaults + appdefdir=$prefix/lib/X11/app-defaults fi else - appresdir=$with_appresdir + appdefdir=$with_appdefdir fi fi - AC_SUBST([appresdir])]) + AC_SUBST([appdefdir])]) -# Emit warning if --with-appresdir hasn't been used. +# Emit warning if --with-appdefdir hasn't been used. -AC_DEFUN([GROFF_APPRESDIR_CHECK], +AC_DEFUN([GROFF_APPDEFDIR_NOTICE], [if test -z "$groff_no_x"; then - if test -z "$with_appresdir"; then + if test -z "$with_appdefdir"; then AC_MSG_NOTICE([ The application defaults files for gxditview (GXditview and GXditview-color) will be installed in the following directory. - $appresdir + $appdefdir To install elsewhere, say, '/etc/X11/app-defaults', add - '--with-appresdir=/etc/X11/app-defaults' to the configure script + '--with-appdefdir=/etc/X11/app-defaults' to the configure script command-line options and rerun it (the 'prefix' value has no effect on - a --with-appresdir option). + a --with-appdefdir option). If the gxditview app-defaults are installed in a directory that is not one of the default X11 directories for this purpose (common defaults diff --git a/src/devices/xditview/gxditview.1.man b/src/devices/xditview/gxditview.1.man index 6828ff47f..ebb9cd938 100644 --- a/src/devices/xditview/gxditview.1.man +++ b/src/devices/xditview/gxditview.1.man @@ -578,9 +578,9 @@ and .\" ==================================================================== . .TP -.I @APPRESDIR@/\:\%GXditview +.I @APPDEFDIR@/\:\%GXditview .TQ -.I @APPRESDIR@/\:\%GXditview\-color +.I @APPDEFDIR@/\:\%GXditview\-color define X application defaults for .IR gxditview . . diff --git a/src/devices/xditview/xditview.am b/src/devices/xditview/xditview.am index 646c95b6f..a2d45882c 100644 --- a/src/devices/xditview/xditview.am +++ b/src/devices/xditview/xditview.am @@ -96,16 +96,16 @@ install_xditview: \ $(MKDIR_P) $(DESTDIR)$(fontdir) $(INSTALL_DATA) $(xditview_srcdir)/FontMap-X11 \ $(DESTDIR)$(fontdir)/FontMap-X11 - -test -d $(DESTDIR)$(appresdir) \ - || $(mkinstalldirs) $(DESTDIR)$(appresdir) + -test -d $(DESTDIR)$(appdefdir) \ + || $(mkinstalldirs) $(DESTDIR)$(appdefdir) $(INSTALL_DATA) $(xditview_srcdir)/GXditview.ad \ - $(DESTDIR)$(appresdir)/GXditview + $(DESTDIR)$(appdefdir)/GXditview $(INSTALL_DATA) $(xditview_srcdir)/GXditview-color.ad \ - $(DESTDIR)$(appresdir)/GXditview-color + $(DESTDIR)$(appdefdir)/GXditview-color uninstall_xditview: - rm -f $(DESTDIR)$(appresdir)/GXditview - rm -f $(DESTDIR)$(appresdir)/GXditview-color + rm -f $(DESTDIR)$(appdefdir)/GXditview + rm -f $(DESTDIR)$(appdefdir)/GXditview-color rm -f $(DESTDIR)$(fontdir)/FontMap-X11 -rmdir $(DESTDIR)$(fontdir) 2>/dev/null diff --git a/src/roff/groff/groff.1.man b/src/roff/groff/groff.1.man index 577cd8901..73ca88dd6 100644 --- a/src/roff/groff/groff.1.man +++ b/src/roff/groff/groff.1.man @@ -1937,9 +1937,9 @@ On this installation, the following locations are used. . . -.if !'@APPRESDIR@'' \{\ +.if !'@APPDEFDIR@'' \{\ .TP -.I @APPRESDIR@ +.I @APPDEFDIR@ Application defaults directory for .MR gxditview @MAN1EXT@ . .\} |