diff options
| author | Bill Meier <wmeier@newsguy.com> | 2010-04-05 21:04:37 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2010-04-05 21:04:37 +0000 |
| commit | fd26f6ccd7296256bd939a9dcbda491c34a44447 (patch) | |
| tree | 10bf1b8bd293a54b6d7048d9c9a0d3eb668ff084 /docbook | |
| parent | 7cfa27b04bc8564d8f2c747e7f78fe55bfa67de3 (diff) | |
Disable the possible use of 'links' to generate release-notes.txt
"Fixes" Bug #4631.
See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4631
svn path=/trunk/; revision=32389
Diffstat (limited to 'docbook')
| -rw-r--r-- | docbook/Makefile.am | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/docbook/Makefile.am b/docbook/Makefile.am index 6282cbecf3..506bf19f90 100644 --- a/docbook/Makefile.am +++ b/docbook/Makefile.am @@ -20,16 +20,18 @@ FOP_OPTS=-Xmx256m # Sorry about the indenting, but that's what automake requires... if HAVE_ELINKS HTML2TXT=$(ELINKS) -dump -dump-width 72 -else -if HAVE_LINKS -HTML2TXT=$(LINKS) -dump -width 72 +## links: -dump requires 'url' argument (as opposed to elinks & lynx) +## (Rather than fixing things we'll just disable the use of links). +##else +##if HAVE_LINKS +##HTML2TXT=$(LINKS) -dump -width 72 else if HAVE_LYNX HTML2TXT=$(LYNX) -dump -width=72 -nolist -stdin -force-html else HTML2TXT="true" endif -endif +##endif endif ############### YOU SHOULDN'T HAVE TO EDIT ANYTHING BELOW THIS LINE! ################ |