[groff] 01/01: clean up Makefile.sub

[Bernd Warken]

bwarken pushed a commit to branch master
in repository groff.

commit a0618720bd2845375f86537a8cc1defce47ac502
Author: Bernd Warken <address@hidden>
Date:   Wed Feb 26 03:13:22 2014 +0100

    clean up Makefile.sub
---
 contrib/groffer/ChangeLog    |    8 ++++++++
 contrib/groffer/Makefile.sub |    4 ++--
 contrib/groffer/groffer.pl   |    9 +++------
 contrib/groffer/version.sh   |    2 +-
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/contrib/groffer/ChangeLog b/contrib/groffer/ChangeLog
index 3e67128..0cbeaff 100644
--- a/contrib/groffer/ChangeLog
+++ b/contrib/groffer/ChangeLog
@@ -1,3 +1,11 @@
+2014-02-26  Bernd Warken  <address@hidden>
+
+       * Makefile.sub: fix
+
+2014-02-26  Bernd Warken  <address@hidden>
+
+       * groffer.pl: Fix modes pdf and pdf2.
+
 2014-02-25  Bernd Warken  <address@hidden>
 
        * groffer.pl: fix source location, when run before `make'
diff --git a/contrib/groffer/Makefile.sub b/contrib/groffer/Makefile.sub
index 32eef58..2bbc620 100644
--- a/contrib/groffer/Makefile.sub
+++ b/contrib/groffer/Makefile.sub
@@ -7,7 +7,7 @@
 # Written by Werner Lemberg <address@hidden> and
 # Bernd Warken <address@hidden>.
 
-# Last update: 25 Feb 2014
+# Last update: 26 Feb 2014
 
 # This file is part of `groffer' which is part of `groff'.
 
@@ -40,7 +40,7 @@ MAN1=groffer.n \
      roff2text.n \
      roff2x.n
 
-MOSTLYCLEANADD=groffer HAVE_PERL HAVE_SHELL groffer.man \
+MOSTLYCLEANADD=groffer HAVE_PERL groffer.man \
                $(MAN1) $(ROFF2MAN) $(ROFF2PROGS)
 
 # not all make programs have $(RM) predefined.
diff --git a/contrib/groffer/groffer.pl b/contrib/groffer/groffer.pl
index e090654..1a19a8b 100755
--- a/contrib/groffer/groffer.pl
+++ b/contrib/groffer/groffer.pl
@@ -171,7 +171,7 @@ my @Conf_Files = (File::Spec->catfile(File::Spec->rootdir(),
                                      'groffer.conf')
                 );
 
-my @Default_Modes = ('pdf', 'pdf2', 'html', 'ps', 'x', 'dvi', 'tty');
+my @Default_Modes = ('pdf', 'html', 'ps', 'x', 'dvi', 'tty');
 my $Default_Resolution = 75;
 my $Default_tty_Device = 'latin1';
 
@@ -834,6 +834,7 @@ sub main_parse_params {
                          'lbp' => 'groff',
                          'lj4' => 'groff',
                          'pdf' => 'pdf',
+                         'pdf2' => 'pdf',
                          'ps' => 'ps',
                          'ascii' => 'tty',
                          'cp1047' => 'tty',
@@ -932,7 +933,7 @@ sub main_parse_params {
                         'www' => 'html',
                         'dvi' => 'dvi',
                         'pdf' => 'pdf',
-                        'pdf2' => 'pdf2',
+                        'pdf2' => 'pdf',
                         'ps' => 'ps',
                         'text' => 'text',
                         'tty' => 'tty',
@@ -1992,10 +1993,6 @@ sub main_display {
     };
 
     /^pdf$/ and do {
-      if ($Opt{'DEVICE'} && $Opt{'DEVICE'} ne 'pdf') {
-       warn "main_display(): " .
-         "wrong device for $Display{'MODE'} mode: $Opt{'DEVICE'};"
-      }
       $modefile .= '.pdf';
       $groggy = `cat $tmp_cat | grog -Tpdf`;
       die "main_display(): grog error;" if $?;
diff --git a/contrib/groffer/version.sh b/contrib/groffer/version.sh
index c513023..339fc33 100644
--- a/contrib/groffer/version.sh
+++ b/contrib/groffer/version.sh
@@ -30,7 +30,7 @@ export _PROGRAM_VERSION;
 export _LAST_UPDATE;
 
 _PROGRAM_VERSION='2.0.2';
-_LAST_UPDATE='25 Feb 2014';
+_LAST_UPDATE='26 Feb 2014';
 
 # this setting of the groff version is only used before make is run,
 # otherwise @VERSION@ will set it, see groffer.sh.