From: Stefan Kost <ensonic@users.sf.net>
Date: Wed, 13 Jan 2010 08:31:26 +0000 (+0200)
Subject: scripts: move gst-uninstalled from docs/faq to scripts
X-Git-Tag: RELEASE-0.10.26~55
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8baf6fa494c87ae9080214e375871a090cdf6af1;p=platform%2Fupstream%2Fgstreamer.git

scripts: move gst-uninstalled from docs/faq to scripts

Don't include the long gst-uninstalled script in verbatim in the faq anymore
(there is a link to cgit). Dist the script under its new location.
---

diff --git a/Makefile.am b/Makefile.am
index a94e456..7bfb7e8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,6 +33,7 @@ EXTRA_DIST = \
 	gst-element-check.m4.in \
 	configure.ac autogen.sh depcomp \
 	MAINTAINERS ABOUT-NLS RELEASE gstreamer.doap \
+	scripts/gst-uninstalled \
 	$(win32)
 
 CLEANFILES = gst-element-check-@GST_MAJORMINOR@.m4
diff --git a/README b/README
index 908386d..425a66d 100644
--- a/README
+++ b/README
@@ -220,7 +220,7 @@ After the autogen.sh stage, you can follow the directions listed in
 "COMPILING FROM SOURCE"
 
 You can also run your whole cvs stack uninstalled.  The script in
-the gstreamer module /docs/faq/gst-uninstalled) is helpful in setting
+the gstreamer module /scripts/gst-uninstalled) is helpful in setting
 up your environment for this.
 
 PLUG-IN DEPENDENCIES AND LICENSES
diff --git a/docs/faq/Makefile.am b/docs/faq/Makefile.am
index bb8edaa..d20b379 100644
--- a/docs/faq/Makefile.am
+++ b/docs/faq/Makefile.am
@@ -17,7 +17,7 @@ PNG_SRC =
 FIG_SRC = $(notdir $(wildcard $(srcdir)/*.fig))
 
 # extra sources to copy in build directory
-EXTRA_SRC = gst-uninstalled
+EXTRA_SRC = 
 
 ### this is the generic bit and you shouln't need to change this
 
diff --git a/docs/faq/developing.xml b/docs/faq/developing.xml
index 81b4c8f..281ebb5 100644
--- a/docs/faq/developing.xml
+++ b/docs/faq/developing.xml
@@ -45,12 +45,9 @@ or integrate with autoconf using the pkg.m4 macro (providing PKG_CONFIG_CHECK).
         <para>
 It is possible to develop and compile against an uninstalled copy of
 gstreamer and gst-plugins-* (for example, against gits checkouts).
-The easiest way to do this is to use a bash script like this (also:
-<ulink url="http://cgit.freedesktop.org/gstreamer/gstreamer/tree/docs/faq/gst-uninstalled">lastest version of gst-uninstalled</ulink>):
+The easiest way to do this is to use a bash script like  this:
+<ulink url="http://cgit.freedesktop.org/gstreamer/gstreamer/tree/docs/faq/gst-uninstalled">lastest version of gst-uninstalled</ulink>.
 
-<programlisting>
-&gst-uninstalled;
-</programlisting>
 If you put this script in your path, and symlink it to gst-git (if you want
 to develop against git master) or to gst-released (if you want to develop
 against the lastest release of each module), it will automatically use the
diff --git a/docs/faq/faq.xml b/docs/faq/faq.xml
index 3c4b3fc..23cec68 100644
--- a/docs/faq/faq.xml
+++ b/docs/faq/faq.xml
@@ -7,8 +7,6 @@
 <!ENTITY % version-entities SYSTEM "version.entities">
 %version-entities;
 
-<!ENTITY gst-uninstalled SYSTEM "gst-uninstalled">
-
 <!ENTITY START SYSTEM "start.xml">
 <!ENTITY GENERAL SYSTEM "general.xml">
 <!ENTITY DEPENDENCIES SYSTEM "dependencies.xml">
diff --git a/docs/faq/gst-uninstalled b/scripts/gst-uninstalled
similarity index 98%
rename from docs/faq/gst-uninstalled
rename to scripts/gst-uninstalled
index 3477772..3766113 100755
--- a/docs/faq/gst-uninstalled
+++ b/scripts/gst-uninstalled
@@ -1,6 +1,6 @@
 #!/bin/bash -i
 #
-# this script is in git as gstreamer/docs/faq/gst-uninstalled
+# this script is in git as gstreamer/scripts/gst-uninstalled
 #
 # It will set up the environment to use and develop gstreamer and projects
 # that use gstreamer with an uninstalled git checkout of gstreamer and the