mirror/groff
1
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/groff.git synced 2026-01-26 15:39:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change $PERLPATH to $PERL.

Browse Source
This commit is contained in:
Bernd Warken 2013-04-15 14:47:43 +00:00
parent 0519992f97
commit 58aa61ace2
10 changed files with 1438 additions and 266 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ChangeLog
View File

@ -1,3 +1,24 @@
2013-04-15 Bernd Warken <groff-bernd.warken-72@web.de>
In the whole `groff' system, rename autoconf variable `$PERLPATH'
to `$PERL', which has the same content. But `$PERL' suits to
`AX_PROG_PERL_VERSION' in m4 macro `GROFF_PERL' in `m4/groff.m4'.
* src/utils/afmtodit/Makefile.sub,
* src/devices/gropdf/gropdf.pl,
* src/devices/gropdf/Makefile.sub,
* src/devices/gropdf/pdfmom.pl,
* arch/djgpp/config.site,
* font/devpdf/Makefile.sub,
* contrib/mm/Makefile.sub,
* m4/groff.m4,
* Makefile.in: Replace `$PERLPATH' by `$PERL'.
* m4/ax_compare_version.m4: New file, copied from daily version of
`GNU autoconf-archive'.
`autoconf' was not yet run, a newer version is needed.
2013-04-15 Bernd Warken <groff-bernd.warken-72@web.de>
* README, INSTALL, INSTALL.gen, MANIFEST: Add documentation in the

2
Makefile.in
View File

@ -430,7 +430,6 @@ ETAGSFLAGS=
ETAGSCCFLAG=-C
# Full path to perl.
PERL=@PERL@
PERLPATH=@PERLPATH@
PERLVERSION=@PERLVERSION@
# Sed command with which to edit sh scripts.
SH_SCRIPT_SED_CMD=@SH_SCRIPT_SED_CMD@
@ -485,7 +484,6 @@ MDEFINES=\
"OTHERDEVDIRS=$(OTHERDEVDIRS)" \
"PAGE=$(PAGE)" \
"GHOSTSCRIPT=$(GHOSTSCRIPT)" \
"PERLPATH=$(PERL)" \
"PSPRINT=$(PSPRINT)" \
"PURIFY=$(PURIFY)" \
"PURIFYCCFLAGS=$(PURIFYCCFLAGS)" \

1621
aclocal.m4 vendored
View File

File diff suppressed because it is too large Load Diff

2
arch/djgpp/config.site
View File

@ -32,7 +32,7 @@ INSTALL=${INSTALL='/dev/env/DJDIR/bin/ginstall -c'}
RANLIB=${RANLIB='ranlib'}
LPR=${LPR='cat >>PRN'}
DVIPRINT=${DVIPRINT='dvilj4 - >>PRN'}
PERLPATH=${PERLPATH='/usr/bin/perl'}
PERL=${PERL='/usr/bin/perl'}
# Force `cp' to be used instead of "ln -s".
ac_cv_prog_LN_S="cp -p"

7
contrib/mm/Makefile.sub
View File

@ -1,5 +1,8 @@
# Copyright 1991-1993, 1999-2001, 2006, 2007, 2009, 2011
# Copyright 1991-1993, 1999-2001, 2006, 2007, 2009, 2011, 2013
# Free Software Foundation, Inc.
#
# Last update: 15 Apr 2013
#
# This file is part of groff.
#
# groff is free software; you can redistribute it and/or modify it under
@ -67,7 +70,7 @@ install_mmroff: mmroff
mmroff: mmroff.pl
-rm -f $@
-sed -e 's;/usr/bin/perl;$(PERLPATH);' $(srcdir)/mmroff.pl >$@
-sed -e 's;/usr/bin/perl;$(PERL);' $(srcdir)/mmroff.pl >$@
-chmod +x $@
uninstall_sub:

7
font/devpdf/Makefile.sub
View File

@ -1,6 +1,9 @@
# Copyright (C) 2011, 2013 Free Software Foundation, Inc.
# Free Software Foundation, Inc.
# Written by Deri James <deri@chuzzlewit.demon.co.uk>
#
# Last update: 15 Apr 2013
#
# This file is part of groff.
#
# groff is free software; you can redistribute it and/or modify it under
@ -76,9 +79,9 @@ DESC: DESC.in
$(top_builddir)/font/devpdf/map
-test -d util || $(mkinstalldirs) util
$(RM) util/BuildFoundries
if test -n "$(PERLPATH)"; then \
if test -n "$(PERL)"; then \
sed -f $(SH_DEPS_SED_SCRIPT) \
-e "s|/usr/bin/perl|$(PERLPATH)|" \
-e "s|/usr/bin/perl|$(PERL)|" \
-e "s|@GROFF_GHOSTSCRIPT_INTERPRETERS@|$(GHOSTSCRIPT)|" \
-e "s|@VERSION@|$(version)$(revision)|" \
-e "s|@GROFF_FONT_DIR@|$(fontdir)|" \

7
src/devices/gropdf/Makefile.sub
View File

@ -1,4 +1,5 @@
# Copyright (C) 2011-2013 Free Software Foundation, Inc.
# Copyright (C) 2011-2013
# Free Software Foundation, Inc.
# Written by Deri James <deri@chuzzlewit.demon.co.uk>
#
# This file is part of groff.
@ -40,7 +41,7 @@ gropdf: gropdf.pl $(SH_DEPS_SED_SCRIPT)
$(RM) $@
sed -f $(SH_DEPS_SED_SCRIPT) \
-e "s|@VERSION@|$(version)$(revision)|" \
-e "s|@PERLPATH@|$(PERLPATH)|" \
-e "s|@PERL@|$(PERL)|" \
-e "s|@GROFF_FONT_DIR@|$(fontpath)|" \
-e "s|@RT_SEP@|$(RT_SEP)|" $(srcdir)/gropdf.pl >$@
chmod +x $@
@ -49,7 +50,7 @@ pdfmom: pdfmom.pl $(SH_DEPS_SED_SCRIPT)
$(RM) $@
sed -f $(SH_DEPS_SED_SCRIPT) \
-e "s|@VERSION@|$(version)$(revision)|" \
-e "s|@PERLPATH@|$(PERLPATH)|" $(srcdir)/pdfmom.pl >$@
-e "s|@PERL@|$(PERL)|" $(srcdir)/pdfmom.pl >$@
chmod +x $@
install_data:

8
src/devices/gropdf/gropdf.pl
View File

@ -1,10 +1,10 @@
#!@PERLPATH@ -w
#!@PERL@ -w
#
# gropdf : PDF post processor for groff
# Deri James : 4th May 2009
# Last update : 15 Apr 2013
#
# Copyright (C) 2011-2013 Free Software Foundation, Inc.
# Copyright (C) 2011-2013
# Free Software Foundation, Inc.
# Written by Deri James <deri@chuzzlewit.demon.co.uk>
#
# This file is part of groff.

5
src/devices/gropdf/pdfmom.pl
View File

@ -1,10 +1,11 @@
#!@PERLPATH@ -w
#!@PERL@ -w
#
# pdfmom : Frontend to run groff -mom to produce PDFs
# Deri James : Friday 16 Mar 2012
#
# Copyright (C) 2012 Free Software Foundation, Inc.
# Copyright (C) 2012,2013
# Free Software Foundation, Inc.
# Written by Deri James <deri@chuzzlewit.demon.co.uk>
#
# This file is part of groff.

24
src/utils/afmtodit/Makefile.sub
View File

@ -1,11 +1,31 @@
# Copyright (C) 2013
# Free Software Foundation, Inc.
#
# Last update: 15 Apr 2013
#
# This file 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/>.
MAN1=afmtodit.n
MOSTLYCLEANADD=afmtodit
all: afmtodit
afmtodit: afmtodit.pl afmtodit.tables
if test -n "$(PERLPATH)"; then \
sed -e "s|/usr/bin/perl|$(PERLPATH)|" \
if test -n "$(PERL)"; then \
sed -e "s|/usr/bin/perl|$(PERL)|" \
-e "s|@VERSION@|$(version)$(revision)|" \
-e "s|@FONTDIR@|$(fontdir)|" \
-e "/@afmtodit.tables@/ r $(srcdir)/afmtodit.tables" \