# Note: Makefile is built automatically from Makefile.in
#
-# $Id: GNUmakefile.in,v 1.204 2011/09/06 18:45:28 fabiankeil Exp $
+# $Id: GNUmakefile.in,v 1.213 2013/01/09 15:06:30 fabiankeil Exp $
#
-# Written by and Copyright (C) 2001-2011 members of the
+# Written by and Copyright (C) 2001-2013 members of the
# Privoxy team. http://www.privoxy.org/
#
# Based on the Internet Junkbuster originally written
# Binaries
BIN_MODE = 0755
# Support files, docs, etc.
-RA_MODE = 0664
+RA_MODE = 0644
# Directory
DIR_MODE = 0755
# Files daemon writes to.
DOC_DIR = doc/source
DOC_TMP = $(DOC_DIR)/tmp
DOC_STATUS = @DOC_STATUS@
-TIDY = tidy -modify -indent -clean -wrap 78
+TIDY = tidy -modify -indent -wrap 78 --tidy-mark no
# Program to do LF->CRLF
#
cd doc/source/webserver && $(DB)-notoc -ip-homepage -V nochunks index.sgml > ../../webserver/index.html
$(PERL) -pi.bak -e 's/..\/p_doc.css/p_doc.css/;\
s/<\/HEAD/\n<meta name=\"description\" content=\"Privoxy helps users to protect their privacy.\"><\/HEAD/;\
- s/<\/HEAD/\n<meta name="MSSmartTagsPreventParsing" content="TRUE"><\/HEAD/;\
s/\.\d\. //;\
s/__copy/©/'\
doc/webserver/index.html && $(RM) doc/webserver/*.bak
cd doc/source/webserver && $(DB)-notoc -ip-index -V nochunks index.sgml > ../../webserver/privoxy-index.html
$(PERL) -pi.bak -e 's/..\/p_doc.css/p_doc.css/;\
s/<\/HEAD/\n<meta name=\"description\" content=\"Privoxy helps users to protect their privacy.\"><\/HEAD/;\
- s/<\/HEAD/\n<meta name="MSSmartTagsPreventParsing" content="TRUE"><\/HEAD/;\
s/\.\d\. //;\
s/__copy/©/' \
doc/webserver/privoxy-index.html && $(RM) doc/webserver/*.bak
# rm -fr $(DOC_TMP)
# The main Privoxy config file, generated from sgml sources.
-# NOTE: This will require some hand editing. The new file is outputted
-# as config.new so that problem sections can be compared to previous
-# version. This is hardcored to w3m for html/text conversion. Also,
-# requires the shell util 'fmt'.
+# NOTE: This will require some hand editing.
config-file: dok-release
cd doc/source && $(DB)-notoc -iconfig-file -V nochunks config.sgml > __tmp.html &&\
- env -u LANG w3m -dump __tmp.html | fmt -w 70 > ../../config.new && $(RM) -r __tmp.*
- $(PERL) -i.bak utils/prepare-configfile.pl config.new
+ env -u LANG LC_ALL=C w3m -dump -cols 67 __tmp.html > ../../config && $(RM) __tmp.*
+ $(PERL) -i.bak utils/prepare-configfile.pl config
$(RM) *.bak
@$(ECHO) "****************************************************"
- @$(ECHO) "The output file is config.new."
- @$(ECHO) "Now -- you need to hand edit the results!!!"
+ @$(ECHO) "The config file has been optimistically updated"
+ @$(ECHO) "Now -- you may need to hand edit the results!"
@$(ECHO) "In particular, check the Debug levels, the"
@$(ECHO) "permit-access, forward & socks examples and the"
@$(ECHO) "various user-manual examples, which all"
- @$(ECHO) "probably got hammered."
+ @$(ECHO) "might have gotten hammered."
@$(ECHO) "****************************************************"
# config file, alternate version using lynx (perl stuff unfinished). Lynx