[Groff-commit] groff ChangeLog Makefile.comm Makefile.in NEWS

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Changes by:     Werner LEMBERG <wl>     06/12/08 21:22:07

Modified files:
        .              : ChangeLog Makefile.comm Makefile.in NEWS 

Log message:
        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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1008&r2=1.1009
http://cvs.savannah.gnu.org/viewcvs/groff/Makefile.comm?cvsroot=groff&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/groff/Makefile.in?cvsroot=groff&r1=1.99&r2=1.100
http://cvs.savannah.gnu.org/viewcvs/groff/NEWS?cvsroot=groff&r1=1.227&r2=1.228

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.1008
retrieving revision 1.1009
diff -u -b -r1.1008 -r1.1009
--- ChangeLog   21 Nov 2006 14:30:48 -0000      1.1008
+++ ChangeLog   8 Dec 2006 21:22:07 -0000       1.1009
@@ -1,3 +1,18 @@
+2006-12-08  Werner LEMBERG  <address@hidden>
+
+       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  <address@hidden>
 
        * 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'. 
 

Index: Makefile.comm
===================================================================
RCS file: /cvsroot/groff/groff/Makefile.comm,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- Makefile.comm       10 Nov 2006 09:52:01 -0000      1.32
+++ Makefile.comm       8 Dec 2006 21:22:07 -0000       1.33
@@ -52,21 +52,17 @@
 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)

Index: Makefile.in
===================================================================
RCS file: /cvsroot/groff/groff/Makefile.in,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -b -r1.99 -r1.100
--- Makefile.in 26 Oct 2006 22:16:16 -0000      1.99
+++ Makefile.in 8 Dec 2006 21:22:07 -0000       1.100
@@ -521,10 +521,10 @@
   "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 @@
 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: 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
 

Index: NEWS
===================================================================
RCS file: /cvsroot/groff/groff/NEWS,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -b -r1.227 -r1.228
--- NEWS        19 Nov 2006 09:56:49 -0000      1.227
+++ NEWS        8 Dec 2006 21:22:07 -0000       1.228
@@ -63,7 +63,6 @@
 
 o `groffer' version 1.* exists now in a shell and a Perl version.
 
-o Rewrite of `grog'.
 
 Pic
 ---
@@ -72,6 +71,9 @@
   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.