fix upload target

Original commit message from CVS:
fix upload target

diff --git a/ChangeLog b/ChangeLog
index 1149ee23d1958a1ed0881405050c25743773dffa..f9b2a87b376b15e0d0b63f65f8d0a92e3847b56a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-28  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+       * docs/manuals.mak:
+          Fix upload target to work with freedesktop
+
 2004-01-28  Ronald Bultje  <rbultje@ronald.bitfreak.net>
 
        * docs/pwg/advanced_types.xml:

diff --git a/docs/manuals.mak b/docs/manuals.mak
index c5ca26b62700b70570891bf204362039c28ea93b..1309790f868bc384351950363880a393d190924e 100644 (file)
--- a/docs/manuals.mak
+++ b/docs/manuals.mak
@@ -170,14 +170,18 @@ check-local: $(BUILDDIR)/$(MAIN)
        cd $(BUILDDIR) && xmllint -noout -valid $(MAIN)
 
 ### this is a website upload target
+### if you want to use it, make sure your ..sh/config file contains the
+### correct User entry for the Host entry for the DOC_SERVER
+DOC_SERVER=freedesktop.org
+DOC_BASE=/home/projects/gstreamer/www/data/doc
+DOC_URL=$(DOC_SERVER):$(DOC_BASE)
 
 upload: html ps pdf
-       @export RSYNC_RSH=ssh; \
-       if test "x$$GST_PLUGINS_VERSION_NANO" = x0; then \
+       @if test "x$$GST_PLUGINS_VERSION_NANO" = x0; then \
             export DOCVERSION=$(VERSION); \
-        else export DOCVERSION=cvs; \
+        else export DOCVERSION=head; \
         fi; \
-       echo Uploading docs to shell.sf.net/home/groups/g/gs/gstreamer/htdocs/docs/$$DOCVERSION; \
-       ssh $(USERNAME)@shell.sf.net mkdir -p /home/groups/g/gs/gstreamer/htdocs/docs/$$DOCVERSION/$(DOC); \
-       rsync -arv $(DOC).ps $(DOC).pdf html $(USERNAME)@shell.sf.net:/home/groups/g/gs/gstreamer/htdocs/docs/$$DOCVERSION/$(DOC)
-
+        export DIR=$(DOC_BASE)/gstreamer/$$DOCVERSION/$(DOC); \
+       echo Uploading docs to $(DOC_SERVER):$$DIR; \
+       ssh $(DOC_SERVER) mkdir -p $$DIR; \
+       rsync -arv -e ssh $(DOC).ps $(DOC).pdf html $(DOC_SERVER):$$DIR