X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=GNUmakefile.in;h=0cd51d97ab191162e5118d06c38395a8e3171f2e;hp=db4772e7b0706f360dd7954711530f709b7b5af9;hb=e8db07c2f0720685bb504013a6a1e576b0cf718f;hpb=8ef1cce0e3dfe6b68730d19d68cbb628219ebf39 diff --git a/GNUmakefile.in b/GNUmakefile.in index db4772e7..0cd51d97 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -1,6 +1,6 @@ # Note: Makefile is built automatically from Makefile.in # -# $Id: GNUmakefile.in,v 1.174 2008/07/18 17:50:47 fabiankeil Exp $ +# $Id: GNUmakefile.in,v 1.180 2009/02/28 08:28:14 fabiankeil Exp $ # # Written by and Copyright (C) 2001 - 2008 the SourceForge # Privoxy team. http://www.privoxy.org/ @@ -167,7 +167,7 @@ RPM_BASE = @RPM_BASE@ ############################################################################# # We include these files in our distributions ############################################################################# -CONFIGS = config trust default.action standard.action user.action default.filter user.filter +CONFIGS = config trust default.action match-all.action user.action default.filter user.filter # take care that no CVS .cvsignore or other crappy files # are included here # and escape every '#' in the find. doh. @@ -699,6 +699,11 @@ man: dok-release mkdir -p doc/source/temp && cd doc/source/temp && $(RM) * ;\ nsgmls ../privoxy-man-page.sgml | sgmlspl ../../../utils/docbook2man/docbook2man-spec.pl &&\ perl -pi.bak -e 's/ //; s/\[ /\[/g' privoxy.1 ;\ + perl -pi.bak -e "s/\[ /\[/g;s/á/\\\\['a]/g;s/é/\\\\['e]/g" privoxy.1; \ + perl -pi.bak -e "s/ö/\\\\[:o]/g" privoxy.1; \ + perl -pi.bak -e 's/([ {])-([a-z])/$$1\\-$$2/g' privoxy.1; \ + perl -pi.bak -e 's/ --([a-z])/ \\-\\-$$1/g' privoxy.1; \ + perl -pi.bak -e 's/\\fB--/\\fB\\-\\-/g' privoxy.1; \ $(DB) ../privoxy-man-page.sgml && $(MV) -f privoxy.1 ../../../privoxy.1 # For those with man2html ala RH7s. @@ -711,6 +716,7 @@ ifneq ($(MAN2HTML),false) # Twice because my version of man2html is pulling in commas and periods in URLs. $(PERL) -pi.bak -e 's/()/$$1$$2/g' tmp.html $(PERL) -pi.bak -e 's,\.">,">,g' tmp.html + $(PERL) -pi.bak -e "s/\['a\]/\á/g;s/\['e\]/\é/g" tmp.html # Get rid of spurious  from conversion. (How to do this with perl?) $(SED) -e 's///g' tmp.html > doc/webserver/man-page/privoxy-man-page.html && $(RM) tmp.* else @@ -845,20 +851,23 @@ config-file-alt: ############################################################################# webserver: tidy @$(ECHO) ------------------------------------------------------- - @$(ECHO) You have run make dok/redhat-dok before, right? - @$(ECHO) Note that this command scps all stuff to the webserver, - @$(ECHO) it will not remove obsolete documents. + @$(ECHO) You will need to "create" a SF shell first: + @$(ECHO) ssh -t USER,PROJECT@shell.sourceforge.net create + @$(ECHO) Please make sure your documentation files are up to date. + @$(ECHO) Note that this command updates the home page and scps + @$(ECHO) all stuff to the webserver, it will not remove obsolete documents. + @$(ECHO) You will also need to change the user-manual symlink manually. @$(ECHO) ------------------------------------------------------- @$(ECHO) Uploading html @cd doc/webserver; \ upload=`find . -type f -a -not \( -path "*/CVS*" -o -path "*/results*" \)`; \ - $(TAR) c $$upload | ssh ijbswa.sourceforge.net 'cd /home/groups/i/ij/ijbswa/htdocs/; tar xvm 2>&1 | grep -v timestamp' + $(TAR) c $$upload | ssh shell.sf.net 'cd /home/groups/i/ij/ijbswa/htdocs/; tar xvm 2>&1 | grep -v timestamp' @$(ECHO) Fixing permissions - @ssh ijbswa.sourceforge.net 'chmod -R 775 /home/groups/i/ij/ijbswa/htdocs 2>/dev/null; true' - @ssh ijbswa.sourceforge.net 'find /home/groups/i/ij/ijbswa/htdocs/ -type f | xargs chmod 664 2>/dev/null; true' - @ssh ijbswa.sourceforge.net 'chmod 666 /home/groups/i/ij/ijbswa/htdocs/actions/results/actions-feedback.txt 2>/dev/null; true' + @ssh shell.sf.net 'chmod -R 775 /home/groups/i/ij/ijbswa/htdocs 2>/dev/null; true' + @ssh shell.sf.net 'find /home/groups/i/ij/ijbswa/htdocs/ -type f | xargs chmod 664 2>/dev/null; true' + @ssh shell.sf.net 'chmod 666 /home/groups/i/ij/ijbswa/htdocs/actions/results/actions-feedback.txt 2>/dev/null; true' web-actions: tidy @@ -915,7 +924,7 @@ urlmatch.@OBJEXT@: urlmatch.c urlmatch.h config.h $(PROJECT_H_DEPS) errlog.h gnu_regex.@OBJEXT@: gnu_regex.c gnu_regex.h config.h # PCRS -pcrs.@OBJEXT@: pcrs.c pcrs.h config.h pcre/pcre.h +pcrs.@OBJEXT@: pcrs.c pcrs.h config.h @STATIC_PCRE_ONLY@pcre/pcre.h # PCRE pcre/get.@OBJEXT@: pcre/get.c pcre/config.h pcre/internal.h pcre/pcre.h @@ -956,7 +965,8 @@ $(PROGRAM): $(OBJS) $(W32_FILES) $(LD) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS) clean: - $(RM) a.out $(OBJS) $(W32_FILES) $(W32_INIS) $(PROGRAM) default.action `find . -name TAGS -o -name tags` config.base config.tmp + $(RM) a.out $(OBJS) $(W32_FILES) $(W32_INIS) $(PROGRAM) default.action \ + `find . -name TAGS -o -name tags | $(GREP) -v .git` config.base config.tmp tidy: $(RM) `find . -name "*~"` @@ -1134,7 +1144,7 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T fi ;\ $(ECHO) Installing configuration files to $(DESTDIR)$(CONF_DEST);\ for i in $(CONFIGS); do \ - if [ "$$i" = "default.action" ] || [ "$$i" = "default.filter" ] || [ "$$i" = "standard.action" ]; then \ + if [ "$$i" = "default.action" ] || [ "$$i" = "default.filter" ] ; then \ $(RM) $(DESTDIR)$(CONF_DEST)/$$i ;\ $(ECHO) Installing fresh $$i;\ $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\ @@ -1308,6 +1318,30 @@ coffee: ## end: # $Log: GNUmakefile.in,v $ +# Revision 1.180 2009/02/28 08:28:14 fabiankeil +# pcrs.o doesn't depend on pcre/pcre.h if we are linking +# dynamically. Patch provided by drauh in #2056286. +# +# Revision 1.179 2009/02/22 14:48:31 hal9 +# Updates to the 'make webserver' target that recreates the home page and uploads +# fresh documents to reflect new SF realities, and more explanation of process. +# +# Revision 1.178 2009/02/08 18:35:48 fabiankeil +# Move the match-all section into a separate file +# (match-all.action) so we can safely overwrite the +# default actions when updating. Based on Roland's +# patch #1563977. +# +# Revision 1.177 2009/01/13 16:44:32 fabiankeil +# Delete the standard.action file after moving +# the pre-settings over to the default actions. +# +# Revision 1.176 2008/09/21 13:24:37 fabiankeil +# Add Roland's man page fixes from 19_manpage_fixup.dpatch. +# +# Revision 1.175 2008/08/30 12:03:07 fabiankeil +# Remove FEATURE_COOKIE_JAR. +# # Revision 1.174 2008/07/18 17:50:47 fabiankeil # Fix whitespace. #