diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-10-08 09:57:27 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-10-08 09:57:27 +0200 |
| commit | f4e033e836d36ee95103886032932bf823db5e3f (patch) | |
| tree | 9a1dda8d0c07a5cfeebc047617b83056d715701c /common | |
| parent | f73db06c09ae3480b3d76a2bba8700444d00f181 (diff) | |
Imported Upstream version 1.0.1upstream/1.0.1
Diffstat (limited to 'common')
| -rw-r--r-- | common/m4/gst-feature.m4 | 2 | ||||
| -rw-r--r-- | common/upload-doc.mak | 14 |
2 files changed, 7 insertions, 9 deletions
diff --git a/common/m4/gst-feature.m4 b/common/m4/gst-feature.m4 index 6da0940..876215e 100644 --- a/common/m4/gst-feature.m4 +++ b/common/m4/gst-feature.m4 @@ -209,7 +209,7 @@ AC_DEFUN([AG_GST_PARSE_SUBSYSTEM_DISABLE], dnl Parse gstconfig.h and defines add the symbols and substitions dnl -dnl GST_CONFIGPATH=`$PKG_CONFIG --variable=includedir gstreamer-0.10`"/gst/gstconfig.h" +dnl GST_CONFIGPATH=`$PKG_CONFIG --variable=includedir gstreamer-1.0`"/gst/gstconfig.h" dnl AG_GST_PARSE_SUBSYSTEM_DISABLES(GST_CONFIGPATH) dnl AC_DEFUN([AG_GST_PARSE_SUBSYSTEM_DISABLES], diff --git a/common/upload-doc.mak b/common/upload-doc.mak index 3bf9496..c1c4945 100644 --- a/common/upload-doc.mak +++ b/common/upload-doc.mak @@ -44,14 +44,12 @@ upload: $(FORMATS) 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; \ \ - # upload releases to both 0.10.X/ and head/ subdirectories \ - if test "x$(PACKAGE_VERSION_NANO)" = x0; then \ - export DIR=$(DOC_BASE)/gstreamer/$(VERSION)/$(DOC); \ - echo Uploading $$SRC to $(DOC_SERVER):$$DIR; \ - ssh $(DOC_SERVER) mkdir -p $$DIR; \ - rsync -rv -e ssh --delete $$SRC $(DOC_SERVER):$$DIR; \ - ssh $(DOC_SERVER) chmod -R g+w $$DIR; \ - fi; \ + # upload releases to both X.Y/ and head/ subdirectories \ + export DIR=$(DOC_BASE)/gstreamer/$(PACKAGE_VERSION_MAJOR).$(PACKAGE_VERSION_MINOR)/$(DOC); \ + echo Uploading $$SRC to $(DOC_SERVER):$$DIR; \ + ssh $(DOC_SERVER) mkdir -p $$DIR; \ + rsync -rv -e ssh --delete $$SRC $(DOC_SERVER):$$DIR; \ + ssh $(DOC_SERVER) chmod -R g+w $$DIR; \ \ export DIR=$(DOC_BASE)/gstreamer/head/$(DOC); \ echo Uploading $$SRC to $(DOC_SERVER):$$DIR; \ |