From 0d07f154d61b8b6465b5a30a7f7c354b87d7973f Mon Sep 17 00:00:00 2001
From: fgerlits <fgerlits@cfc7b370-4200-0410-a6e3-cb6bdb053afe>
Date: Thu, 24 Aug 2006 18:19:52 +0000
Subject: [PATCH] Fixing #1767.  The problem was that "make all" in gst-plugins
 depends on "make install" in gstreamer, so "all" and "install" can not be
 separated.

---
 .../gstreamer/gstreamer-0.8.10/etc/Makefile.in    | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/livesupport/src/tools/gstreamer/gstreamer-0.8.10/etc/Makefile.in b/livesupport/src/tools/gstreamer/gstreamer-0.8.10/etc/Makefile.in
index 5788a1b18..b3a72ad06 100644
--- a/livesupport/src/tools/gstreamer/gstreamer-0.8.10/etc/Makefile.in
+++ b/livesupport/src/tools/gstreamer/gstreamer-0.8.10/etc/Makefile.in
@@ -65,6 +65,7 @@ pkg_config_path=${libdir}/pkgconfig
 USR_DIR=${prefix}
 USR_BIN_DIR=${USR_DIR}/bin
 USR_LIB_DIR=${libdir}
+USR_INCLUDE_DIR=${USR_DIR}/include
 
 export PATH:=${USR_BIN_DIR}:${PATH}
 export CPPFLAGS=-I${USR_DIR}/include
@@ -83,6 +84,7 @@ ${TMP_DIR}/all.stamp:
         ./configure --prefix=${prefix} \
                     --with-pkg-config-path=${pkg_config_path}
 	${MAKE} -C ${GSTREAMER_DIR}
+	${MAKE} -C ${GSTREAMER_DIR} install
 	cd ${GST_PLUGINS_DIR} && \
 		./configure --prefix=${prefix} \
                     --with-pkg-config-path=${pkg_config_path} \
@@ -90,13 +92,16 @@ ${TMP_DIR}/all.stamp:
 					--disable-gconf --disable-gconftool \
 					--disable-opengl 
 	${MAKE} -C ${GST_PLUGINS_DIR}
+	${MAKE} -C ${GST_PLUGINS_DIR} install
 	touch ${TMP_DIR}/all.stamp
 
-install: all ${TMP_DIR}/install.stamp
-${TMP_DIR}/install.stamp:
-	${MAKE} -C ${GSTREAMER_DIR} install
-	${MAKE} -C ${GST_PLUGINS_DIR} install
-	touch ${TMP_DIR}/install.stamp
+install: all
+
+uninstall:
+	${RM} ${USR_BIN_DIR}/gst-*
+	${RMDIR} ${USR_LIB_DIR}/gstreamer*
+	${RM} ${USR_LIB_DIR}/libgst*
+	${RMDIR} ${USR_INCLUDE_DIR}/gstreamer*
 
 clean:
 	${RM} ${TMP_DIR}/*.stamp