projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The version that got sent out to the mailing lists
[privoxy.git]
/
GNUmakefile.in
diff --git
a/GNUmakefile.in
b/GNUmakefile.in
index
7950b58
..
64d5174
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.1
88 2010/02/20 12:51:38
fabiankeil Exp $
+# $Id: GNUmakefile.in,v 1.1
93 2010/11/14 14:59:33
fabiankeil Exp $
#
# Written by and Copyright (C) 2001-2010 members of the
# Privoxy team. http://www.privoxy.org/
#
# Written by and Copyright (C) 2001-2010 members of the
# Privoxy team. http://www.privoxy.org/
@@
-612,17
+612,23
@@
config-file-alt:
webserver: tidy
@$(ECHO) -------------------------------------------------------
@$(ECHO) You will need to "create" a SF shell first:
webserver: tidy
@$(ECHO) -------------------------------------------------------
@$(ECHO) You will need to "create" a SF shell first:
- @$(ECHO) ssh -t
USER,PROJECT
@shell.sourceforge.net create
+ @$(ECHO) ssh -t
SF-USER-ID,ijbswa
@shell.sourceforge.net create
@$(ECHO) Please make sure your documentation files are up to date.
@$(ECHO) Please make sure your documentation files are up to date.
- @$(ECHO) Note that this command updates the home page and
scp
s
+ @$(ECHO) Note that this command updates the home page and
copy
s
@$(ECHO) all stuff to the webserver, it will not remove obsolete documents.
@$(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) Note that a botched upload can result in the documentation
+ @$(ECHO) on the website becoming unreachable! Also the CSS files
+ @$(ECHO) currently seem to end up at the wrong place.
@$(ECHO) -------------------------------------------------------
@$(ECHO) -------------------------------------------------------
+ @$(ECHO) Replacing the user-manual symlink
+ @$(SSH) shell.sourceforge.net "cd /home/groups/i/ij/ijbswa/htdocs && rm user-manual \
+ && mkdir -p $(VERSION)/user-manual && ln -s $(VERSION)/user-manual user-manual"
+
@$(ECHO) Uploading html
@cd doc/webserver; \
upload=`find . -type f -a -not \( -path "*/CVS*" -o -path "*/results*" \)`; \
@$(ECHO) Uploading html
@cd doc/webserver; \
upload=`find . -type f -a -not \( -path "*/CVS*" -o -path "*/results*" \)`; \
- $(TAR) cf - $$upload |
ssh
shell.sourceforge.net 'cd /home/groups/i/ij/ijbswa/htdocs/; tar xvm 2>&1 | grep -v timestamp'
+ $(TAR) cf - $$upload |
$(SSH)
shell.sourceforge.net 'cd /home/groups/i/ij/ijbswa/htdocs/; tar xvm 2>&1 | grep -v timestamp'
@$(ECHO) Fixing permissions
@$(SSH) shell.sourceforge.net 'chmod -R 775 /home/groups/i/ij/ijbswa/htdocs 2>/dev/null; true'
@$(ECHO) Fixing permissions
@$(SSH) shell.sourceforge.net 'chmod -R 775 /home/groups/i/ij/ijbswa/htdocs 2>/dev/null; true'
@@
-632,7
+638,7
@@
web-actions: tidy
@$(ECHO) Uploading
@cd doc/webserver/actions; \
upload=`find . -type f -a -not \( -path "*/CVS*" -o -path "*/results*" \)`; \
@$(ECHO) Uploading
@cd doc/webserver/actions; \
upload=`find . -type f -a -not \( -path "*/CVS*" -o -path "*/results*" \)`; \
- $(TAR) cf - $$upload |
ssh
ijbswa.sourceforge.net 'cd /home/groups/i/ij/ijbswa/htdocs/actions; tar xvm'
+ $(TAR) cf - $$upload |
$(SSH)
ijbswa.sourceforge.net 'cd /home/groups/i/ij/ijbswa/htdocs/actions; tar xvm'
@$(ECHO) Fixing permissions
@$(SSH) ijbswa.sourceforge.net 'find /home/groups/i/ij/ijbswa/htdocs/actions/ -type f | xargs chmod 664 2>/dev/null'
@$(ECHO) Fixing permissions
@$(SSH) ijbswa.sourceforge.net 'find /home/groups/i/ij/ijbswa/htdocs/actions/ -type f | xargs chmod 664 2>/dev/null'