projects
/
privoxy.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
02381bd
)
Stop pretending that lynx and links are supported for the documentation
author
Fabian Keil
<fk@fabiankeil.de>
Thu, 10 Jan 2013 11:03:58 +0000
(11:03 +0000)
committer
Fabian Keil
<fk@fabiankeil.de>
Thu, 10 Jan 2013 11:03:58 +0000
(11:03 +0000)
GNUmakefile.in
patch
|
blob
|
history
configure.in
patch
|
blob
|
history
diff --git
a/GNUmakefile.in
b/GNUmakefile.in
index
097f25e
..
4306cb3
100644
(file)
--- a/
GNUmakefile.in
+++ b/
GNUmakefile.in
@@
-1,6
+1,6
@@
# Note: Makefile is built automatically from Makefile.in
#
# Note: Makefile is built automatically from Makefile.in
#
-# $Id: GNUmakefile.in,v 1.21
4 2013/01/09 15:08:5
1 fabiankeil Exp $
+# $Id: GNUmakefile.in,v 1.21
5 2013/01/10 11:03:3
1 fabiankeil Exp $
#
# Written by and Copyright (C) 2001-2013 members of the
# Privoxy team. http://www.privoxy.org/
#
# Written by and Copyright (C) 2001-2013 members of the
# Privoxy team. http://www.privoxy.org/
@@
-130,8
+130,8
@@
CHMOD = chmod
CHOWN = chown
CHGRP = chgrp
GROUPS = groups
CHOWN = chown
CHGRP = chgrp
GROUPS = groups
-W
DUMP = env -u LANG LC_ALL=C @WDUMP
@ -dump
-W
DUMP_UTF8 = @WDUMP
@ -dump
+W
3M_DUMP = env -u LANG LC_ALL=C @W3M
@ -dump
+W
3M_DUMP_UTF8 = @W3M
@ -dump
JADECAT = @JADECAT@
JADEBIN = @JADEBIN@
DB = $(JADEBIN) $(JADECAT) -ihtml -t sgml -D.. -d ldp.dsl\#html
JADECAT = @JADECAT@
JADEBIN = @JADEBIN@
DB = $(JADEBIN) $(JADECAT) -ihtml -t sgml -D.. -d ldp.dsl\#html
@@
-504,9
+504,9
@@
groff2html:
# readme page and INSTALL file
dok-readme: dok-release
cd doc/source && $(DB)-notoc -V nochunks readme.sgml > tmp.html &&\
# readme page and INSTALL file
dok-readme: dok-release
cd doc/source && $(DB)-notoc -V nochunks readme.sgml > tmp.html &&\
- $(WDUMP) tmp.html > ../../README ;\
+ $(W
3M_
DUMP) tmp.html > ../../README ;\
$(DB)-notoc -V nochunks install.sgml > tmp.html &&\
$(DB)-notoc -V nochunks install.sgml > tmp.html &&\
- $(WDUMP) tmp.html > ../../INSTALL ;\
+ $(W
3M_
DUMP) tmp.html > ../../INSTALL ;\
$(RM) tmp.*
# index.sgml is used to create both the Home Page, and a local index
$(RM) tmp.*
# index.sgml is used to create both the Home Page, and a local index
@@
-536,7
+536,7
@@
dok: dok-release dok-devel dok-user dok-faq dok-readme dok-webserver dok-authors
## Make AUTHORS file
dok-authors:
## Make AUTHORS file
dok-authors:
- cd doc/source && $(DB) -V nochunks authors.sgml > tmp.html && $(WDUMP_UTF8) \
+ cd doc/source && $(DB) -V nochunks authors.sgml > tmp.html && $(W
3M_
DUMP_UTF8) \
tmp.html > ../../AUTHORS && $(RM) tmp.html
# Set doc entities for VERSION and CODE_STATUS in sgml docs. Toggle content
tmp.html > ../../AUTHORS && $(RM) tmp.html
# Set doc entities for VERSION and CODE_STATUS in sgml docs. Toggle content
@@
-565,9
+565,9
@@
dok-release:
# announce: dok-release
# mkdir -p $(DOC_TMP)
# cd $(DOC_TMP) && cp -f ../announce.sgml . && $(DB) -iannounce-big announce.sgml &&\
# announce: dok-release
# mkdir -p $(DOC_TMP)
# cd $(DOC_TMP) && cp -f ../announce.sgml . && $(DB) -iannounce-big announce.sgml &&\
-# mv -f index.html announce.html && $(WDUMP) announce.html > announce.txt
+# mv -f index.html announce.html && $(W
3M_
DUMP) announce.html > announce.txt
# cd $(DOC_TMP) && $(DB) announce.sgml &&\
# cd $(DOC_TMP) && $(DB) announce.sgml &&\
-# mv -f index.html announce-mini.html && $(WDUMP) announce-mini.html > announce-mini.txt &&\
+# mv -f index.html announce-mini.html && $(W
3M_
DUMP) announce-mini.html > announce-mini.txt &&\
# mv -f *html *txt ../../..
# rm -fr $(DOC_TMP)
# mv -f *html *txt ../../..
# rm -fr $(DOC_TMP)
@@
-575,7
+575,7
@@
dok-release:
# NOTE: This will require some hand editing.
config-file: dok-release
cd doc/source && $(DB)-notoc -iconfig-file -V nochunks config.sgml > __tmp.html &&\
# NOTE: This will require some hand editing.
config-file: dok-release
cd doc/source && $(DB)-notoc -iconfig-file -V nochunks config.sgml > __tmp.html &&\
- $(WDUMP) -cols 67 __tmp.html > ../../config && $(RM) __tmp.*
+ $(W
3M_
DUMP) -cols 67 __tmp.html > ../../config && $(RM) __tmp.*
$(PERL) -i.bak utils/prepare-configfile.pl config
$(RM) *.bak
$(PERL) -i.bak utils/prepare-configfile.pl config
$(RM) *.bak
diff --git
a/configure.in
b/configure.in
index
9567440
..
691c5a6
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-1,6
+1,6
@@
dnl Process this file with autoconf to produce a configure script.
dnl
dnl Process this file with autoconf to produce a configure script.
dnl
-dnl $Id: configure.in,v 1.17
5 2012/12/09 12:27:01
fabiankeil Exp $
+dnl $Id: configure.in,v 1.17
6 2013/01/06 11:06:23
fabiankeil Exp $
dnl
dnl Written by and Copyright (C) 2001-2010 the
dnl Privoxy team. http://www.privoxy.org/
dnl
dnl Written by and Copyright (C) 2001-2010 the
dnl Privoxy team. http://www.privoxy.org/
@@
-32,7
+32,7
@@
dnl =================================================================
dnl AutoConf Initialization
dnl =================================================================
dnl AutoConf Initialization
dnl =================================================================
-AC_REVISION($Revision: 1.17
5
$)
+AC_REVISION($Revision: 1.17
6
$)
AC_INIT(jcc.c)
if test ! -f config.h.in; then
AC_INIT(jcc.c)
if test ! -f config.h.in; then
@@
-316,11
+316,10
@@
else
fi
AC_SUBST(WIN_ONLY)
fi
AC_SUBST(WIN_ONLY)
-dnl Checking which text html browser we have available
if test $dodk != no; then
if test $dodk != no; then
- AC_CHECK_PROGS(W
DUMP,w3m lynx links,
false)
- if test "$W
DUMP
" = false; then
- AC_MSG_WARN(You need
some kind of text browser to build documentation \(w3m, lynx and links are supported\)
)
+ AC_CHECK_PROGS(W
3M, w3m,
false)
+ if test "$W
3M
" = false; then
+ AC_MSG_WARN(You need
w3m to build text documentation.
)
fi
if test $DB2HTML = false; then
dnl We need to clean the variable, otherwise AC_CHECK_PROGS
fi
if test $DB2HTML = false; then
dnl We need to clean the variable, otherwise AC_CHECK_PROGS
@@
-329,7
+328,7
@@
if test $dodk != no; then
AC_CHECK_PROGS(DB2HTML,db2html docbook2html,false)
fi
fi
AC_CHECK_PROGS(DB2HTML,db2html docbook2html,false)
fi
fi
-AC_SUBST(W
DUMP
)
+AC_SUBST(W
3M
)
AC_SUBST(DB2HTML)
dnl If we use rpm, we need to check where %_topdir is
AC_SUBST(DB2HTML)
dnl If we use rpm, we need to check where %_topdir is