projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add the '/js/slider\.js' removal to the ChangeLog
[privoxy.git]
/
GNUmakefile.in
diff --git
a/GNUmakefile.in
b/GNUmakefile.in
index
fc3881b
..
4d778bb
100644
(file)
--- a/
GNUmakefile.in
+++ b/
GNUmakefile.in
@@
-1,8
+1,8
@@
# Note: Makefile is built automatically from Makefile.in
#
# Note: Makefile is built automatically from Makefile.in
#
-# $Id: GNUmakefile.in,v 1.2
12 2013/01/09 15:05:20
fabiankeil Exp $
+# $Id: GNUmakefile.in,v 1.2
20 2013/02/05 14:01:38
fabiankeil Exp $
#
#
-# Written by and Copyright (C) 2001-201
1
members of the
+# Written by and Copyright (C) 2001-201
3
members of the
# Privoxy team. http://www.privoxy.org/
#
# Based on the Internet Junkbuster originally written
# Privoxy team. http://www.privoxy.org/
#
# Based on the Internet Junkbuster originally written
@@
-130,7
+130,8
@@
CHMOD = chmod
CHOWN = chown
CHGRP = chgrp
GROUPS = groups
CHOWN = chown
CHGRP = chgrp
GROUPS = groups
-WDUMP = @WDUMP@ -dump
+W3M_DUMP = env -u LANG LC_ALL=C @W3M@ -dump
+W3M_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
@@
-503,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 &&\
-
env -u LANG $(W
DUMP) tmp.html > ../../README ;\
+
$(W3M_
DUMP) tmp.html > ../../README ;\
$(DB)-notoc -V nochunks install.sgml > tmp.html &&\
$(DB)-notoc -V nochunks install.sgml > tmp.html &&\
-
env -u LANG $(W
DUMP) tmp.html > ../../INSTALL ;\
+
$(W3M_
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
@@
-535,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 &&
env -u LANG $(WDUMP
) \
+ cd doc/source && $(DB) -V nochunks authors.sgml > tmp.html &&
$(W3M_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
@@
-564,20
+565,17
@@
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)
# The main Privoxy config file, generated from sgml sources.
# NOTE: This will require some hand editing.
# mv -f *html *txt ../../..
# rm -fr $(DOC_TMP)
# The main Privoxy config file, generated from sgml sources.
# 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 LC_ALL=C w3m -dump -cols 67 __tmp.html > ../../config && $(RM) __tmp.*
- $(PERL) -i.bak utils/prepare-configfile.pl config
+config-file: dok-release generate-config-file
- $(RM)
*.bak
+ $(RM)
config.bak config.html
@$(ECHO) "****************************************************"
@$(ECHO) "The config file has been optimistically updated"
@$(ECHO) "Now -- you may need to hand edit the results!"
@$(ECHO) "****************************************************"
@$(ECHO) "The config file has been optimistically updated"
@$(ECHO) "Now -- you may need to hand edit the results!"
@@
-587,6
+585,11
@@
config-file: dok-release
@$(ECHO) "might have gotten hammered."
@$(ECHO) "****************************************************"
@$(ECHO) "might have gotten hammered."
@$(ECHO) "****************************************************"
+generate-config-file:
+ cd doc/source && $(DB)-notoc -iconfig-file -V nochunks config.sgml > ../../config.html
+ $(W3M_DUMP) -cols 67 config.html > config
+ $(PERL) -i.bak utils/prepare-configfile.pl config
+
# config file, alternate version using lynx (perl stuff unfinished). Lynx
# does not do so good a job.
config-file-alt:
# config file, alternate version using lynx (perl stuff unfinished). Lynx
# does not do so good a job.
config-file-alt:
@@
-740,7
+743,9
@@
$(PROGRAM): $(OBJS) $(W32_FILES)
clean:
$(RM) a.out $(OBJS) $(W32_FILES) $(W32_INIS) $(PROGRAM) default.action \
clean:
$(RM) a.out $(OBJS) $(W32_FILES) $(W32_INIS) $(PROGRAM) default.action \
- `find . -name TAGS -o -name tags | $(GREP) -v .git` config.base config.tmp
+ config.base config.tmp \
+ `find . \( -name TAGS -o -name tags \) -and -not -path "./.git/refs/tags"` \
+ `find . -name "*.orig" -a -not -name rc.privoxy.orig`
clean-editor-files:
$(RM) `find . -name "*~"`
clean-editor-files:
$(RM) `find . -name "*~"`