During installation, create soft link from <version> to `current' in

<datadir>/groff.

* Makefile.comm (install): Renamed to...
(do_install): This.
(prefix_must_exist): Removed.  Code moved to Makefile.in.

* Makefile.in (TARGETS): Remove `install'.

(install): New target which first creates the directory given by
--prefix, then calling `make' to do the installation, and finishing
with the creation of the soft link.

4 files changed, 34 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 707a20bc..6cff2d44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2006-12-08  Werner LEMBERG  <wl@gnu.org>
+
+	During installation, create soft link from <version> to `current' in
+	<datadir>/groff.
+
+	* Makefile.comm (install): Renamed to...
+	(do_install): This.
+	(prefix_must_exist): Removed.  Code moved to Makefile.in.
+
+	* Makefile.in (TARGETS): Remove `install'.
+
+	(install): New target which first creates the directory given by
+	--prefix, then calling `make' to do the installation, and finishing
+	with the creation of the soft link.
+
 2006-11-21  Werner LEMBERG  <wl@gnu.org>
 
 	* doc/Makefile.sub (uninstall_sub): Fix names for info files.
@@ -39,7 +54,7 @@
 
 2006-11-09  Bernd Warken
 
-	* INSTALL.gen: Extent the file by information on `external
+	* INSTALL.gen: Extend the file by information on `external
 	installation'.  Reorder the installation instruction as `normal
 	installation'. 
 
diff --git a/Makefile.comm b/Makefile.comm
index 60e03893..729d06b7 100644
--- a/Makefile.comm
+++ b/Makefile.comm
@@ -52,21 +52,17 @@ MANPAGES=$(MAN1) $(MAN5) $(MAN7)
 MANCLEAN=$(MANPAGES)
 fontsubdir=$(fontdir)/dev$(DEV)
 
-all install install_bin install_data TAGS depend distfiles uninstall_sub:
+all do_install install_bin install_data TAGS depend distfiles uninstall_sub:
 
-install: prefix_must_exist install_bin install_data
+do_install: install_bin install_data
 uninstall: uninstall_sub
 pure:
 
 .PHONY: all clean distclean mostlyclean realclean extraclean depend distfiles
-.PHONY: install install_bin install_data prefix_must_exist
+.PHONY: install install_bin install_data
 .PHONY: uninstall uninstall_sub
 .PHONY: pure
 
-prefix_must_exist:
-	@test -d $(DESTDIR)$(prefix) \
-	  || $(mkinstalldirs) $(DESTDIR)$(prefix)
-
 mostlyclean:
 	-rm -f $(MOSTLYCLEANFILES)
 	-rm -rf $(CLEANDIRADD)
diff --git a/Makefile.in b/Makefile.in
index a5026a7e..73f569dd 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -521,10 +521,10 @@ MDEFINES= \
   "man7ext=$(man7ext)" \
   "manroot=$(manroot)" \
   "mkinstalldirs=$(mkinstalldirs)" \
+  "pnmtops_nosetpage=$(pnmtops_nosetpage)" \
   "prefix=$(prefix)" \
   "revision=$(revision)" \
   "sys_tmac_prefix=$(sys_tmac_prefix)" \
-  "pnmtops_nosetpage=$(pnmtops_nosetpage)" \
   "systemtmacdir=$(systemtmacdir)" \
   "tmac_an_prefix=$(tmac_an_prefix)" \
   "tmac_m_prefix=$(tmac_m_prefix)" \
@@ -621,7 +621,7 @@ NOMAKEDIRS=\
 DISTDIRS=\
   $(INCDIRS) $(LIBDIRS) $(PROGDIRS) $(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) \
   $(ALLTTYDEVDIRS) $(OTHERDIRS) $(EXTRADIRS) $(NOMAKEDIRS)
-TARGETS=all install install_bin install_data clean distclean mostlyclean \
+TARGETS=all install_bin install_data clean distclean mostlyclean \
   realclean extraclean distfiles TAGS depend uninstall_sub
 
 # This ENVSETUP gork is required by the DJGPP build on Windows 9X,
@@ -782,6 +782,16 @@ Makefile.cfg: Makefile
 Makefile: Makefile.in
 	$(SHELL) config.status
 
+.PHONY: install
+install:
+	-test -d $(DESTDIR)$(prefix) \
+	  || $(mkinstalldirs) $(DESTDIR)$(prefix)
+	@$(ENVSETUP); $(MAKE) $(MAKE_K_FLAG) $(MDEFINES) \
+	  do=do_install $(dodirs)
+	cd $(DESTDIR)$(dataprogramdir); \
+	rm -f current; \
+	$(LN_S) $(version)$(revision) current
+
 .PHONY: uninstall
 uninstall: uninstall_sub uninstall_dirs
 
diff --git a/NEWS b/NEWS
index b416ac30..f872fa43 100644
--- a/NEWS
+++ b/NEWS
@@ -63,7 +63,6 @@ o A new escape `\$^' has been added.  It represents the parameters of a
 
 o `groffer' version 1.* exists now in a shell and a Perl version.
 
-o Rewrite of `grog'.
 
 Pic
 ---
@@ -72,6 +71,9 @@ o int(x) now really behaves as documented: It truncates the non-integer part
   of x, this is, it rounds towards zero and not towards the next integer
   less than or equal to x.
 
+Chem
+----
+
 o The preprocessor `chem' was added.  `chem' is a roff language to generate
   chemical structure diagrams.  It generates `pic' output.