[Groff-commit] groff ChangeLog src/roff/grog/Makefile.sub

[Bernd Warken]

CVSROOT:        /cvsroot/groff
Module name:    groff
Changes by:     Bernd Warken <bwarken>  13/04/12 14:19:02

Modified files:
        .              : ChangeLog 
        src/roff/grog  : Makefile.sub 

Log message:
        grog: remove shell version. Add file perl_test.pl for testing the 
available
        Perl version.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1403&r2=1.1404
http://cvs.savannah.gnu.org/viewcvs/groff/src/roff/grog/Makefile.sub?cvsroot=groff&r1=1.14&r2=1.15

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.1403
retrieving revision 1.1404
diff -u -b -r1.1403 -r1.1404
--- ChangeLog   12 Apr 2013 13:11:14 -0000      1.1403
+++ ChangeLog   12 Apr 2013 14:19:02 -0000      1.1404
@@ -1,5 +1,19 @@
 2013-04-12  Bernd Warken  <address@hidden>
 
+       * `grog': Remove the shell version of `grog'.  Now there is only
+       Perl version.
+
+       * src/roff/grog/perl.sh: Remove this file.
+
+       * src/roff/grog/Makefile.sub: This file handles the removement of
+       the shell version.
+
+       * src/roff/grog/perl_test.pl: New file for testing the available
+       Perl version in the system to be installed into.  This file will
+       be installed into the grog lib-directory.
+
+2013-04-12  Bernd Warken  <address@hidden>
+
        * `grog': In the following, the file `grog.pl' will be split.  For
        the coming files, a lib-directory is needed for storage.
 

Index: src/roff/grog/Makefile.sub
===================================================================
RCS file: /cvsroot/groff/groff/src/roff/grog/Makefile.sub,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- src/roff/grog/Makefile.sub  8 Jan 2009 08:28:28 -0000       1.14
+++ src/roff/grog/Makefile.sub  12 Apr 2013 14:19:02 -0000      1.15
@@ -2,9 +2,9 @@
 
 # File position: <groff-source>/src/roff/grog/Makefile.sub
 
-# Copyright (C) 1993, 2006, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1993, 2006, 2009, 2013 Free Software Foundation, Inc.
 
-# Last update: 5 Jan 2009
+# Last update: 12 Apr 2013
 
 # This file is part of `grog' which is part of `groff'.
 
@@ -24,34 +24,59 @@
 ########################################################################
 
 MAN1=grog.n
-MOSTLYCLEANADD=grog
+MOSTLYCLEANADD=grog $(MAN1) HAVE_PERL
+
+# not all make programs have $(RM) predefined.
+RM=rm -f
 
 all: grog $(MAN1)
 
-grog: grog.pl grog.sh $(SH_DEPS_SED_SCRIPT)
-       address@hidden -f $@;
-       if test -n "$(PERLPATH)" && test -f "$(PERLPATH)" && \
-         "$(PERLPATH)" -e 'require v5.6'; then \
-         echo 'Using the Perl version for grog.'; \
-         sed -f "$(SH_DEPS_SED_SCRIPT)" \
-             -e "s|@VERSION@|$(version)$(revision)|" \
-             -e "$(SH_SCRIPT_SED_CMD)" \
-              $(srcdir)/grog.pl >$@; \
-       else \
-         echo 'Using the shell version for grog.'; \
+GROG=$(srcdir)/perl_test.pl
+
+GROG_=`echo $(GROG) | sed 's|$(srcdir)/||g'`
+
+grog: grog.pl $(SH_DEPS_SED_SCRIPT)
+       address@hidden(RM) -f $@;
+        if perl $(srcdir)/perl_test.pl 2>&1 >/dev/null; then \
+          : >HAVE_PERL; \
+          echo "Perl version works for "$@"'."; \
          sed -f "$(SH_DEPS_SED_SCRIPT)" \
              -e "s|@g@|$(g)|g" \
+             -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \
+              -e "s|@libdir@|$(DESTDIR)$(libdir)|g" \
              -e "s|@EGREP@|$(EGREP)|g" \
              -e "s|@VERSION@|$(version)$(revision)|" \
              -e "$(SH_SCRIPT_SED_CMD)" \
-              $(srcdir)/grog.sh >$@; \
+              $(srcdir)/grog.pl >$@; \
+          chmod +x $@; \
+       else \
+         echo "This program "$@" needs a newer version of Perl."; \
+         exit 1
        fi
        chmod +x $@
 
 install_data: grog
-       address@hidden -d $(DESTDIR)$(bindir) || $(mkinstalldirs) 
$(DESTDIR)$(bindir)
-       address@hidden -f $(DESTDIR)$(bindir)/grog
+       -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
+       $(RM) $(DESTDIR)$(bindir)/grog
        $(INSTALL_SCRIPT) grog $(DESTDIR)$(bindir)/grog
+        -test -d $(DESTDIR)$(grog_dir) \
+          || $(mkinstalldirs) $(DESTDIR)$(grog_dir)
+        for f in $(GROG_); do \
+          $(RM) $(DESTDIR)$(grog_dir)/$$f; \
+        done
+        if test -f HAVE_PERL; then \
+          for f in $(GROG_); do \
+            $(INSTALL_SCRIPT) $(srcdir)/$$f \
+              $(DESTDIR)$(grog_dir)/$$f; \
+          done; \
+        fi;
+
+
 
 uninstall_sub:
-       -rm -f $(DESTDIR)$(bindir)/grog
+       $(RM) $(DESTDIR)$(bindir)/grog
+        for f in $(GROG_); do \
+          $(RM) $(DESTDIR)$(grog_dir)/$$f; \
+        done
+        -test -d $(DESTDIR)$(libdir)/groff/grog || \
+          rmdir $(DESTDIR)$(libdir)/groff/grog