On Thursday 16 June 2005 7:46 am, Werner LEMBERG wrote:
> MATCH="$MATCH`echo --$OPT | $GREP "^$OPTNAME"`"
>
> I suspect that the
>
> "...`..."..."`"
>
> combination causes the problem.
Here's the patch to fix this -- I hope. I've also incorporated Bernd's
NULLDEV typo correction, and Zvezdan's Makefile.sub patch in
pdfroff-20050617-1.patch; if you prefer them separated, use
pdfroff-20050617-2.patch instead, but please don't apply both.
ChangeLog-20050617.patch corrects a typo, in a prior ChangeLog entry;
ChangeLog-20050617.entry gives proposed Changelog entries for all recent
changes, not yet recorded.
I still can't see any obvious work around for the `unexpected "}", expecting
"fi"' problem -- difficult to solve, when I don't know how to reproduce it :-(
Best regards,
Keith.
Index: contrib/pdfmark/Makefile.sub
===================================================================
RCS file: /cvsroot/groff/groff/contrib/pdfmark/Makefile.sub,v
retrieving revision 1.6
diff -u -r1.6 Makefile.sub
--- contrib/pdfmark/Makefile.sub 28 May 2005 07:10:16 -0000 1.6
+++ contrib/pdfmark/Makefile.sub 17 Jun 2005 04:04:26 -0000
@@ -35,6 +35,9 @@
$(PDFDOCFILES) \
$(CMDFILES)
+# Some `makes' don't predefine RM...
+RM=rm -f
+
GROFF_BIN_DIR=$(top_builddir)/src/roff/groff
GROFF_OTHER_BIN_DIRS=\
$(top_builddir)/src/roff/troff \
Index: contrib/pdfmark/pdfroff.sh
===================================================================
RCS file: /cvsroot/groff/groff/contrib/pdfmark/pdfroff.sh,v
retrieving revision 1.5
diff -u -r1.5 pdfroff.sh
--- contrib/pdfmark/pdfroff.sh 26 May 2005 21:01:58 -0000 1.5
+++ contrib/pdfmark/pdfroff.sh 17 Jun 2005 04:04:27 -0000
@@ -29,7 +29,7 @@
# MS-DOS/MS-Windows systems may require us to use "NUL".
#
NULLDEV="/dev/null"
- test -c $NULLDEV || NULDEV="NUL"
+ test -c $NULLDEV || NULLDEV="NUL"
#
# Set up the command name to use in diagnostic messages.
# (We can't assume we have 'basename', so use the full path if required.
@@ -166,7 +166,7 @@
MATCH="" OPTNAME=`IFS==; set dummy $1; echo $2`
for OPT in $LONGOPTS
do
- MATCH="$MATCH`echo --$OPT | $GREP "^$OPTNAME"`"
+ MATCH="$MATCH"`echo --$OPT | $GREP "^$OPTNAME"`
done
#
# For options in the form --option=value
@@ -568,4 +568,4 @@
$SAY >&2 ". done"
#
#
------------------------------------------------------------------------------
-# $Source: end of file
+# $Source$: end of file
Index: contrib/pdfmark/pdfroff.sh
===================================================================
RCS file: /cvsroot/groff/groff/contrib/pdfmark/pdfroff.sh,v
retrieving revision 1.5
diff -u -r1.5 pdfroff.sh
--- contrib/pdfmark/pdfroff.sh 26 May 2005 21:01:58 -0000 1.5
+++ contrib/pdfmark/pdfroff.sh 17 Jun 2005 04:04:27 -0000
@@ -166,7 +166,7 @@
MATCH="" OPTNAME=`IFS==; set dummy $1; echo $2`
for OPT in $LONGOPTS
do
- MATCH="$MATCH`echo --$OPT | $GREP "^$OPTNAME"`"
+ MATCH="$MATCH"`echo --$OPT | $GREP "^$OPTNAME"`
done
#
# For options in the form --option=value
@@ -568,4 +568,4 @@
$SAY >&2 ". done"
#
#
------------------------------------------------------------------------------
-# $Source: end of file
+# $Source$: end of file
Index: contrib/pdfmark/ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/contrib/pdfmark/ChangeLog,v
retrieving revision 1.11
diff -u -r1.11 ChangeLog
--- contrib/pdfmark/ChangeLog 18 May 2005 07:03:07 -0000 1.11
+++ contrib/pdfmark/ChangeLog 17 Jun 2005 04:04:24 -0000
@@ -7,7 +25,7 @@
(searchpath): New shell function; use it instead of `type' command
to locate prerequisite helper programs.
- * pdfroff.man: Socument influence of `TYPE' and `PATH_SEPARATOR'
+ * pdfroff.man: Document influence of `OSTYPE' and `PATH_SEPARATOR'
environment variables.
* Makefile.sub: (pdfroff): Make it depend on SH_DEPS_SED_SCRIPT,
2005-06-17 Keith Marshall <[EMAIL PROTECTED]>
* pdfroff.sh: (MATCH): Correct quoting.
(Source): Add terminating `$' on CVS keyword.
2005-06-17 Zvezdan Petkovic <[EMAIL PROTECTED]>
* Makefile.sub: (RM): Define as `rm -f', for `make' programs
which don't predefine it.
2005-06-16 Bernd Warken <[EMAIL PROTECTED]>
* pdfroff.sh: (NULLDEV): Correct misspelled instance of NULDEV.
2005-05-28 Werner LEMBERG <[EMAIL PROTECTED]>
* Makefile.sub (.ms.pdf): Use `--stylesheet', not `--style'.
_______________________________________________
Groff mailing list
Groff@gnu.org
http://lists.gnu.org/mailman/listinfo/groff
