* Makefile.in: Fixing $(subdir).

* README, NEWS: Small fixes.

* test-groff: Adding path to grolbp.

* configure.in: The (new) file src/xditview/Imakefile.in will be
also configured -- it is now possible to build gxditview in a
directory different from $srcdir.

7 files changed, 32 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index 7d4e4d3a..0eaf7cc8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2000-03-03  Werner LEMBERG  <wl@gnu.org>
+
+	* Makefile.in: Fixing $(subdir).
+
+	* README, NEWS: Small fixes.
+
+	* test-groff: Adding path to grolbp.
+
+	* configure.in: The (new) file src/xditview/Imakefile.in will be
+	also configured -- it is now possible to build gxditview in a
+	directory different from $srcdir.
+
 2000-03-02  Blake McBride  <blake@florida-software.com>
 
 	* src/libs/libgroff/searchpath.cc (open_file): Adapting to WinNT.
diff --git a/Makefile.in b/Makefile.in
index 1544d568..411d2c0f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -349,7 +349,7 @@ TARGETS=all install install_bin install_data clean distclean mostlyclean \
 do=all
 dodirs=$(ALLDIRS) dot
 # Default target for subdir_Makefile
-subdir=troff
+subdir=src/roff/troff
 
 
 $(TARGETS):
diff --git a/NEWS b/NEWS
index cb56b96e..df0eeb25 100644
--- a/NEWS
+++ b/NEWS
@@ -16,9 +16,9 @@ better support of HTML output:
      name metrics type code [entity_name] [-- comment]
 
   Currently, only the font description files in devhtml use the optional
-  entity_name string to define the glyph entities in HTML.  Everything
-  after the entity_name field is ignored; in case this field isn't used,
-  two hyphen characters are now necessary to start a comment.
+  entity_name string to define glyph entities in HTML.  Everything after the
+  entity_name field is ignored; in case this field isn't used, two hyphen
+  characters are now necessary to start a comment.
 
   Two new requests are available in DESC files (currently used only with
   grohtml):
@@ -81,9 +81,9 @@ Added .LINE macro to tmac.arkup.
 
 The obsolete `.LINK' macro has been removed.
 
-.URL, .FTP, and .MAILTO now accept an optional third argument which will
-be immediately appended to the second argument (to be used with punctuation,
-for example).
+.URL, .FTP, and .MAILTO macros now accept an optional third argument which
+will be immediately appended to the second argument (to be used with
+punctuation, for example).
 
 Grolbp
 ------
@@ -103,7 +103,7 @@ and Barry Roitblat, and has been adapted to groff by Daniel Senderowicz
 Pic
 ---
 
-Added the `srand' command to set the seed for a new sequence of the
+Added the `srand' command to set the seed for a new sequence of
 pseudo-random numbers to be returned by `rand'.
 
 VERSION 1.13, 1.14, 1.15
diff --git a/README b/README
index e2caad8b..62ea08d8 100644
--- a/README
+++ b/README
@@ -2,12 +2,12 @@ This is the GNU groff document formatting system.  The version number
 is given in the file VERSION.
 
 Included in this release are implementations of troff, pic, eqn, tbl,
-grn, refer, -man, -mdoc, and -ms macros, and drivers for PostScript,
-TeX dvi format, HP LaserJet 4 printers, HTML format (still alpha), and
-typewriter-like devices.  Also included is a modified version of the
-Berkeley -me macros, an enhanced version of the X11 xditview previewer,
-and an implementation of the -mm macros contributed by Joergen Haegg
-(jh@axis.se).
+grn, refer, -man, -mdoc, and -ms macros, and drivers for PostScript, TeX
+dvi format, HP LaserJet 4 printers, Canon CAPSL printers, HTML format
+(still alpha), and typewriter-like devices.  Also included is a modified
+version of the Berkeley -me macros, an enhanced version of the X11
+xditview previewer, and an implementation of the -mm macros contributed
+by Joergen Haegg (jh@axis.se).
 
 See the file INSTALL for installation instructions.  You will require a
 C++ compiler.
diff --git a/configure b/configure
index 4c85d4eb..698d570e 100755
--- a/configure
+++ b/configure
@@ -2618,6 +2618,7 @@ fi
 echo "$ac_t""$tmac_wrap" 1>&6
 
 
+$srcdir/mkinstalldirs src/xditview
 trap '' 1 2 15
 cat > confcache <<\EOF
 # This file is a shell script that caches the results of configure
@@ -2731,7 +2732,7 @@ done
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "Makefile src/xditview/Imakefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -2828,7 +2829,7 @@ EOF
 
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
+CONFIG_FILES=\${CONFIG_FILES-"Makefile src/xditview/Imakefile"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
diff --git a/configure.in b/configure.in
index 74498966..e757a9d9 100755
--- a/configure.in
+++ b/configure.in
@@ -51,4 +51,5 @@ GROFF_BROKEN_SPOOLER_FLAGS
 GROFF_PAGE
 GROFF_G
 GROFF_TMAC
-AC_OUTPUT(Makefile)
+$srcdir/mkinstalldirs src/xditview
+AC_OUTPUT(Makefile src/xditview/Imakefile)
diff --git a/test-groff b/test-groff
index 16a25c8f..83492ea6 100644
--- a/test-groff
+++ b/test-groff
@@ -23,6 +23,7 @@ $builddir/devices/grops:\
 $builddir/devices/grodvi:\
 $builddir/devices/grotty:\
 $builddir/devices/grolj4:\
+$builddir/devices/grolbp:\
 $builddir/devices/grohtml:\
 $srcdir/$builddir/xditview:\
 $PATH