deri pushed a commit to branch master in repository groff. commit 788dbdb3395c08432992ef6ee58d1d974e536193 Author: Deri James <d...@chuzzlewit.myzen.co.uk> Date: Mon Jun 15 18:58:02 2015 +0100
pdfmom should use $RT_SEP as path separator. * src/devices/gropdf/gropdf.am: Use @RT_SEP@ as path separator. * src/devices/gropdf/pdfmom.pl: As above but also fix typo in regex for grep. --- ChangeLog | 12 ++++++++++++ src/devices/gropdf/gropdf.am | 1 + src/devices/gropdf/pdfmom.pl | 5 +++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 022f006..eec3b97 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2015-06-15 Deri James <d...@chuzzlewit.myzen.co.uk> + + pdfmom should use $RT_SEP as path separator. + + * src/devices/gropdf/gropdf.am: + + Use @RT_SEP@ as path separator. + + * src/devices/gropdf/pdfmom.pl: + + As above but also fix typo in regex for grep. + 2015-05-08 Eli Zaretskii <e...@gnu.org> [groff] Make relocation really work. diff --git a/src/devices/gropdf/gropdf.am b/src/devices/gropdf/gropdf.am index f96a714..4388aee 100644 --- a/src/devices/gropdf/gropdf.am +++ b/src/devices/gropdf/gropdf.am @@ -45,5 +45,6 @@ pdfmom: $(gropdf_dir)/pdfmom.pl $(SH_DEPS_SED_SCRIPT) $(RM) $@ sed -f $(SH_DEPS_SED_SCRIPT) \ -e "s|[@]VERSION[@]|$(VERSION)|" \ + -e "s|[@]RT_SEP[@]|$(RT_SEP)|" \ -e "s|[@]PERL[@]|$(PERL)|" $(gropdf_dir)/pdfmom.pl >$@ chmod +x $@ diff --git a/src/devices/gropdf/pdfmom.pl b/src/devices/gropdf/pdfmom.pl index beec820..a346ff6 100644 --- a/src/devices/gropdf/pdfmom.pl +++ b/src/devices/gropdf/pdfmom.pl @@ -29,8 +29,9 @@ my @cmd; my $dev='pdf'; my $preconv=''; my $readstdin=1; +my $RT_SEP='@RT_SEP@'; -$ENV{PATH}=$ENV{GROFF_BIN_PATH}.':'.$ENV{PATH} if exists($ENV{GROFF_BIN_PATH}); +$ENV{PATH}=$ENV{GROFF_BIN_PATH}.$RT_SEP.$ENV{PATH} if exists($ENV{GROFF_BIN_PATH}); $ENV{TMPDIR}=$ENV{GROFF_TMPDIR} if exists($ENV{GROFF_TMPDIR}); while (my $c=shift) @@ -122,7 +123,7 @@ if ($readstdin) if ($dev eq 'pdf') { - system("groff -Tpdf -dPDF.EXPORT=1 -mom -z $cmdstring 2>&1 | grep '^\.ds' | groff -Tpdf -mom - $preconv $cmdstring"); + system("groff -Tpdf -dPDF.EXPORT=1 -mom -z $cmdstring 2>&1 | grep \"^\\.ds\" | groff -Tpdf -mom - $preconv $cmdstring"); } elsif ($dev eq 'ps') { _______________________________________________ Groff-commit mailing list Groff-commit@gnu.org https://lists.gnu.org/mailman/listinfo/groff-commit