summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Schleef <ds@schleef.org>2004-04-19 22:51:57 +0000
committerDavid Schleef <ds@schleef.org>2004-04-19 22:51:57 +0000
commit11d1c74e1207764fb1e49512752ff06919d42e6e (patch)
tree140ab9cd7c894ef6d977284b3e52780de8b0fa23
parent2cc141545c4dbf66860c8d05b8b9380a6abd3eaf (diff)
gconf/Makefile.am: Fix for non-GNU make
Original commit message from CVS: * gconf/Makefile.am: Fix for non-GNU make * gst-libs/gst/Makefile.am: Change directory order to handle GstPlay linking with gstinterfaces * gst-libs/gst/audio/make_filter: make use of tr portable * gst-libs/gst/play/Makefile.am: Add intended \ * gst-libs/gst/xwindowlistener/xwindowlistener.c: (gst_xwin_set_clips): Switch to ISO variadic macro. Use a function prototype instead of void *. * gst/ffmpegcolorspace/gstffmpegcodecmap.c: Switch to ISO variadic macro. * gst/ffmpegcolorspace/gstffmpegcolorspace.c: (gst_ffmpegcolorspace_chain): wrap NULL in GST_ELEMENT_ERROR call * gst/videofilter/make_filter: make use of tr portable * pkgconfig/Makefile.am: Remove GNU extension in Makefile target
-rw-r--r--ChangeLog17
-rw-r--r--gconf/Makefile.am2
-rwxr-xr-xgst/videofilter/make_filter9
3 files changed, 25 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 5a2d0600..c0a8627d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2004-04-19 David Schleef <ds@schleef.org>
+
+ * gconf/Makefile.am: Fix for non-GNU make
+ * gst-libs/gst/Makefile.am: Change directory order to handle
+ GstPlay linking with gstinterfaces
+ * gst-libs/gst/audio/make_filter: make use of tr portable
+ * gst-libs/gst/play/Makefile.am: Add intended \
+ * gst-libs/gst/xwindowlistener/xwindowlistener.c:
+ (gst_xwin_set_clips): Switch to ISO variadic macro. Use a
+ function prototype instead of void *.
+ * gst/ffmpegcolorspace/gstffmpegcodecmap.c: Switch to ISO variadic
+ macro.
+ * gst/ffmpegcolorspace/gstffmpegcolorspace.c:
+ (gst_ffmpegcolorspace_chain): wrap NULL in GST_ELEMENT_ERROR call
+ * gst/videofilter/make_filter: make use of tr portable
+ * pkgconfig/Makefile.am: Remove GNU extension in Makefile target
+
2004-04-19 Thomas Vander Stichele <thomas at apestaart dot org>
* po/LINGUAS:
diff --git a/gconf/Makefile.am b/gconf/Makefile.am
index 8fa37fbc..660a66e3 100644
--- a/gconf/Makefile.am
+++ b/gconf/Makefile.am
@@ -2,7 +2,7 @@ schemadir = @GCONF_SCHEMA_FILE_DIR@
schema_DATA = gstreamer-@GST_MAJORMINOR@.schemas
gstreamer-@GST_MAJORMINOR@.schemas: gstreamer.schemas
- cp $< $@
+ cp gstreamer.schemas gstreamer-@GST_MAJORMINOR@.schemas
install-data-local:
@GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) \
diff --git a/gst/videofilter/make_filter b/gst/videofilter/make_filter
index 990ccb04..692d0d52 100755
--- a/gst/videofilter/make_filter
+++ b/gst/videofilter/make_filter
@@ -1,5 +1,10 @@
#!/bin/sh
+LANG=C
+export LANG
+LC_COLLATE=C
+export LC_COLLATE
+
Template=$1;
srcfile=$2;
@@ -18,8 +23,8 @@ id=`echo '$Id$' | sed \
-e 's/\$I[d]: \([^$]*\)\$/\1/g'`
echo $id
-TEMPLATE=`echo $Template | tr a-z A-Z`
-template=`echo $Template | tr A-Z a-z`
+TEMPLATE=`echo $Template | tr [:lower:] [:upper:]`
+template=`echo $Template | tr [:upper:] [:lower:]`
# remember to break up the Id: in the line below
sed \