[Groff-commit] groff ChangeLog contrib/glilypond/ChangeLog con...

[Bernd Warken]

CVSROOT:        /cvsroot/groff
Module name:    groff
Changes by:     Bernd Warken <bwarken>  13/04/25 22:37:58

Modified files:
        .              : ChangeLog 
        contrib/glilypond: ChangeLog Makefile.sub 
        src/roff/groff : Makefile.sub 

Log message:
        src/roff/groff/read_groff_options.pl: Reads `groff' options from
        `groff.cpp' and writes them into the file `groff_options.info'.
        
        src/roff/groff/Makefile.sub: Have the generated file
        `groff_options.info' be installed into the `groff libdir'.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1412&r2=1.1413
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/glilypond/ChangeLog?cvsroot=groff&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/glilypond/Makefile.sub?cvsroot=groff&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/groff/src/roff/groff/Makefile.sub?cvsroot=groff&r1=1.5&r2=1.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.1412
retrieving revision 1.1413
diff -u -b -r1.1412 -r1.1413
--- ChangeLog   16 Apr 2013 19:00:42 -0000      1.1412
+++ ChangeLog   25 Apr 2013 22:37:57 -0000      1.1413
@@ -1,3 +1,11 @@
+2013-04-26  Bernd Warken  <address@hidden>
+
+       * src/roff/groff/read_groff_options.pl: Reads `groff' options from
+       `groff.cpp' and writes them into the file `groff_options.info'.
+
+       * src/roff/groff/Makefile.sub: Have the generated file
+       `groff_options.info' be installed into the `groff libdir'.
+
 2013-04-16  Bernd Warken  <address@hidden>
 
        * INSTALL.gen: Replace this file by the daily `git' version of

Index: contrib/glilypond/ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/contrib/glilypond/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- contrib/glilypond/ChangeLog 25 Apr 2013 00:21:14 -0000      1.10
+++ contrib/glilypond/ChangeLog 25 Apr 2013 22:37:57 -0000      1.11
@@ -1,3 +1,7 @@
+2013-04-25  Bernd Warken  <address@hidden>
+
+       * Makefile.sub: minor corrections.
+
 2013-04-24  Bernd Warken  <address@hidden>
 
        Public `glilypond' version `v1.1'.

Index: contrib/glilypond/Makefile.sub
===================================================================
RCS file: /cvsroot/groff/groff/contrib/glilypond/Makefile.sub,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- contrib/glilypond/Makefile.sub      24 Apr 2013 21:23:38 -0000      1.4
+++ contrib/glilypond/Makefile.sub      25 Apr 2013 22:37:58 -0000      1.5
@@ -7,7 +7,7 @@
 # Written by Werner Lemberg <address@hidden> and
 # Bernd Warken <address@hidden>.
 
-# Last update: 24 Apr 2013
+# Last update: 25 Apr 2013
 
 # This file is part of `glilypond' which is part of `groff'.
 
@@ -72,8 +72,8 @@
        for f in $(GLILYPOND_); do \
                $(RM) $(DESTDIR)$(glilypond_dir)/$$f; \
        done
-       test -d $(DESTDIR)$(libdir)/groff/glilypond \
-               && rmdir $(DESTDIR)$(libdir)/groff/glilypond
+       -test -d $(DESTDIR)$(libdir)/groff/glilypond \
+               && -rmdir $(DESTDIR)$(libdir)/groff/glilypond
 
 ########################################################################
 # Emacs settings

Index: src/roff/groff/Makefile.sub
===================================================================
RCS file: /cvsroot/groff/groff/src/roff/groff/Makefile.sub,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- src/roff/groff/Makefile.sub 31 Jan 2011 10:18:17 -0000      1.5
+++ src/roff/groff/Makefile.sub 25 Apr 2013 22:37:58 -0000      1.6
@@ -1,3 +1,31 @@
+# Makefile.sub for `glilypond' (integration into the `groff' source tree)
+
+# File position: <groff-source>/contrib/lilypond/Makefile.sub
+
+# Copyright (C) 1993, 2013
+#   Free Software Foundation, Inc.
+#   Rewritten by Werner Lemberg <address@hidden> and
+#     Bernd Warken <address@hidden>.
+
+# Last update: 25 Apr 2013
+
+# This file is part of `glilypond' which is part of `groff'.
+
+# `groff' is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# `groff' is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+########################################################################
+
 PROG=groff$(EXEEXT)
 MAN1=groff.n
 XLIBS=$(LIBGROFF) $(LIBGNU)
@@ -6,3 +34,32 @@
 CCSRCS=$(srcdir)/groff.cpp
 CSRCS=$(srcdir)/pipeline.c
 HDRS=$(srcdir)/pipeline.h
+
+MOSTLYCLEANADD=groff_options.info
+
+RM=rm -f
+
+all: groff_options.info
+
+groff_options.info: read_groff_options.pl
+                   ./$< > $@
+
+install_data: groff_options.info
+       -test -d $(DESTDIR)$(libdir)/groff \
+               || $(mkinstalldirs) $(DESTDIR)$(libdir)/groff
+       $(RM) $(DESTDIR)$(libdir)/groff/$<
+       $(INSTALL_SCRIPT) $< $(DESTDIR)$(libdir)/groff
+
+uninstall_sub:
+       $(RM) $(DESTDIR)$(libdir)/groff/groff_options.info
+       -test -d $(DESTDIR)$(libdir)/groff \
+                && -rmdir $(DESTDIR)$(libdir)/groff
+
+
+########################################################################
+# Emacs settings
+########################################################################
+#
+# Local Variables:
+# mode: makefile
+# End: