docs: Fix up the upload-doc.mak and remove upload.mak

For some reason we have 2 nearly identical copies of the upload make
snippet, one of which is broken. Fix them up, and remove upload.mak as
upload-doc.mak is the better name

diff --git a/Makefile.am b/Makefile.am
index bafde23..1807c3c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ CONFIG_CLEAN_FILES = shave shave-libtool
 EXTRA_DIST = \
        ChangeLog \
        gettext.patch \
-       glib-gen.mak gtk-doc.mak upload.mak upload-doc.mak \
+       glib-gen.mak gtk-doc.mak upload-doc.mak \
        release.mak win32.mak po.mak \
        gst-autogen.sh \
        check-exports \

diff --git a/upload-doc.mak b/upload-doc.mak
index c9251fb..60731e5 100644 (file)
--- a/upload-doc.mak
+++ b/upload-doc.mak
@@ -9,17 +9,16 @@
 # - FORMATS: the formats in which DOC is output
 #            (html ps pdf)
 
-# if you want to use it, make sure your ..sh/config file contains the
+# if you want to use it, make sure your $HOME/.ssh/config file contains the
 # correct User entry for the Host entry for the DOC_SERVER
 
 # these variables define the location of the online docs
-DOC_SERVER=gstreamer.freedesktop.org
-DOC_BASE=/srv/gstreamer.freedesktop.org/www/data/doc
-DOC_URL=$(DOC_SERVER):$(DOC_BASE)
-
+DOC_SERVER = gstreamer.freedesktop.org
+DOC_BASE = /srv/gstreamer.freedesktop.org/www/data/doc
+DOC_URL = $(DOC_SERVER):$(DOC_BASE)
 
 upload: $(FORMATS)
-       @if test "x$(GST_VERSION_NANO)" = x0; then \
+       @if test "x$(PACKAGE_VERSION_NANO)" = x0; then \
             export DOCVERSION=$(VERSION); \
         else export DOCVERSION=head; \
         fi; \

diff --git a/upload.mak b/upload.mak
deleted file mode 100644 (file)
index 60731e5..0000000
--- a/upload.mak
+++ /dev/null
@@ -1,33 +0,0 @@
-# this snippet is to be included by both our docbook manuals
-# and gtk-doc API references
-
-# it adds an upload target to each of these dir's Makefiles
-
-# each Makefile.am should define the following variables:
-# - DOC: the base name of the documentation
-#        (faq, manual, pwg, gstreamer, gstreamer-libs)
-# - FORMATS: the formats in which DOC is output
-#            (html ps pdf)
-
-# if you want to use it, make sure your $HOME/.ssh/config file contains the
-# correct User entry for the Host entry for the DOC_SERVER
-
-# these variables define the location of the online docs
-DOC_SERVER = gstreamer.freedesktop.org
-DOC_BASE = /srv/gstreamer.freedesktop.org/www/data/doc
-DOC_URL = $(DOC_SERVER):$(DOC_BASE)
-
-upload: $(FORMATS)
-       @if test "x$(PACKAGE_VERSION_NANO)" = x0; then \
-            export DOCVERSION=$(VERSION); \
-        else export DOCVERSION=head; \
-        fi; \
-        export DIR=$(DOC_BASE)/gstreamer/$$DOCVERSION/$(DOC); \
-       ssh $(DOC_SERVER) mkdir -p $$DIR; \
-       if echo $(FORMATS) | grep html > /dev/null; then export SRC="$$SRC html"; fi; \
-       if echo $(FORMATS) | grep ps > /dev/null; then export SRC="$$SRC $(DOC).ps"; fi; \
-       if echo $(FORMATS) | grep pdf > /dev/null; then export SRC="$$SRC $(DOC).pdf"; fi; \
-       echo Uploading $$SRC to $(DOC_SERVER):$$DIR; \
-       rsync -rv -e ssh --delete $$SRC $(DOC_SERVER):$$DIR; \
-       ssh $(DOC_SERVER) chmod -R g+w $$DIR; \
-       echo Done