[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[groff] 01/01: top ChangeLog: add Emacs-mode, separate License by a line
From: |
Bernd Warken |
Subject: |
[groff] 01/01: top ChangeLog: add Emacs-mode, separate License by a line. grog: remove perl_test.pl. |
Date: |
Wed, 18 Jun 2014 09:47:30 +0000 |
bwarken pushed a commit to branch master
in repository groff.
commit 6ad5b045e1d20359d2b69dd4a95658b69638bc1f
Author: Bernd Warken <address@hidden>
Date: Wed Jun 18 11:47:17 2014 +0200
top ChangeLog: add Emacs-mode, separate License by a line.
grog: remove perl_test.pl.
---
ChangeLog | 26 ++++++++++++++++++++++++--
src/roff/grog/Makefile.sub | 22 +++++++++++++++++-----
src/roff/grog/grog.pl | 7 +------
src/roff/grog/perl_test.pl | 41 -----------------------------------------
src/roff/grog/subs.pl | 2 +-
5 files changed, 43 insertions(+), 55 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b30a8b3..6ac297a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2014-06-18 Bernd Warken <address@hidden>
+
+ * src/roff/grog/Makefile.sub: Add $(RM).
+
+ * src/roff/grog/grog.pl: Remove call to perl_test.pl. `require
+ 5.6;' is enough as Perl test.
+
+ * src/roff/grog/perl_test.pl: Remove this file.
+
+2014-06-18 Bernd Warken <address@hidden>
+
+ * ChangeLog: Add Emacs-mode and a separator for the license.
+
2014-06-17 Bernd Warken <address@hidden>
* src/roff/grog/subs.pl: Correct handling of option `-J' for
@@ -524,7 +537,7 @@
Necessary for Bernd's code to extract groff options.
-2013-07-16 Ingo Schwarze <address@hidden>
+2013-07-16 Ingo Schwarze <address@hidden>
* tmac/an-old.tmac (TP): Do not clobber line length after double
call to `.TP'.
@@ -1913,14 +1926,23 @@ Version 1.22 released
* doc/webpage.ms: Fix rendering of title image.
+
+________________________________________________________________________
+
+##### License
+
Copyright 2011-2014
- Free Software Foundation, Inc.
+ Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright
notice and this notice are preserved.
+
+##### Emacs settings
+
Local Variables:
+mode: change-log
version-control: never
coding: utf-8
End:
diff --git a/src/roff/grog/Makefile.sub b/src/roff/grog/Makefile.sub
index d5957bd..0257dcd 100644
--- a/src/roff/grog/Makefile.sub
+++ b/src/roff/grog/Makefile.sub
@@ -27,6 +27,9 @@
MAN1=grog.n
MOSTLYCLEANADD=grog $(MAN1)
+# not all make programs have $(RM) predefined.
+RM=rm -f
+
all: grog $(MAN1)
# lib .pl-files
@@ -37,7 +40,7 @@ GROG_=`echo $(GROG) | sed 's|$(srcdir)/||g'`
# Perl version works for all parts of `groff'.
grog: grog.pl $(GROG) $(SH_DEPS_SED_SCRIPT)
- rm -f $@
+ $(RM) $@
sed -f "$(SH_DEPS_SED_SCRIPT)" \
-e "1s|^\(#! \).*perl|\\1$(PERL)|" \
-e "s|@g@|$(g)|g" \
@@ -52,19 +55,28 @@ grog: grog.pl $(GROG) $(SH_DEPS_SED_SCRIPT)
.PHONY: install_data
install_data: grog
-test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
- rm -f $(DESTDIR)$(bindir)/grog
+ $(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 -f $(DESTDIR)$(grog_dir)/$$f; \
+ $(RM) $(DESTDIR)$(grog_dir)/$$f; \
$(INSTALL_SCRIPT) $(srcdir)/$$f $(DESTDIR)$(grog_dir)/$$f; \
done
.PHONY: uninstall_data
uninstall_sub:
- rm -f $(DESTDIR)$(bindir)/grog
+ $(RM) $(DESTDIR)$(bindir)/grog
-for f in $(GROG_); do \
- rm -f $(DESTDIR)$(grog_dir)/$$f; \
+ $(RM) $(DESTDIR)$(grog_dir)/$$f; \
done
-d=$(DESTDIR)$(grog_dir);\
if test -d $$d; then rmdir $$d; fi
+
+
+########################################################################
+# Emacs settings
+########################################################################
+#
+# Local Variables:
+# mode: makefile
+# End:
diff --git a/src/roff/grog/grog.pl b/src/roff/grog/grog.pl
index c59d2f8..6ebde5c 100644
--- a/src/roff/grog/grog.pl
+++ b/src/roff/grog/grog.pl
@@ -30,7 +30,7 @@
# <http://www.gnu.org/licenses/gpl-2.0.html>.
########################################################################
-our $Last_Update = '16 Jun 2014';
+our $Last_Update = '18 Jun 2014';
########################################################################
require v5.6;
@@ -49,15 +49,12 @@ my $before_make; # script before run of `make'
our %at_at;
-my $file_perl_test_pl;
my $grog_dir;
if ($before_make) { # before installation
my $grog_source_dir = $FindBin::Bin;
$at_at{'BINDIR'} = $grog_source_dir;
$grog_dir = $grog_source_dir;
- $file_perl_test_pl = File::Spec->catfile($grog_source_dir,
- 'perl_test.pl');
my $top = $grog_source_dir . '/../../../';
open FILE, '<', $top . 'VERSION' ||
die 'Could not open top file VERSION.';
@@ -73,8 +70,6 @@ if ($before_make) { # before installation
$at_at{'GROFF_VERSION'} = '@VERSION@';
$at_at{'BINDIR'} = '@BINDIR@';
$grog_dir = '@grog_dir@';
- $file_perl_test_pl = File::Spec->catfile($grog_dir,
- 'perl_test.pl');
}
die "$grog_dir is not an existing directory;" unless -d $grog_dir;
diff --git a/src/roff/grog/perl_test.pl b/src/roff/grog/perl_test.pl
deleted file mode 100644
index 5cc18cc..0000000
--- a/src/roff/grog/perl_test.pl
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /usr/bin/env perl
-
-# grog - create groff arguments for `roff' files
-
-# Source file position: <groff-source>/roff/grog/perl_test.sh
-# Installed position: <prefix>/lib/groff/grog/perl_test.sh
-
-# Copyright (C) 2013-14
-# Free Software Foundation, Inc.
-# Written by Bernd Warken <address@hidden>.
-
-# Last update: 04 Jun 2014
-
-# This file is part of `grog', 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/>.
-
-########################################################################
-
-# This file tests whether perl has a suitable version. It is used by
-# grog.pl and Makefile.sub.
-
-require v5.6;
-
-
-########################################################################
-### Emacs settings
-# Local Variables:
-# mode: CPerl
-# End:
diff --git a/src/roff/grog/subs.pl b/src/roff/grog/subs.pl
index 49be389..c7e747a 100644
--- a/src/roff/grog/subs.pl
+++ b/src/roff/grog/subs.pl
@@ -30,7 +30,7 @@
# <http://www.gnu.org/licenses/gpl-2.0.html>.
########################################################################
-# Last_Update = '17 Jun 2014';
+# Last_Update = '18 Jun 2014';
########################################################################
require v5.6;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [groff] 01/01: top ChangeLog: add Emacs-mode, separate License by a line. grog: remove perl_test.pl.,
Bernd Warken <=