totem r5341 - in branches/gnome-2-22: . data

[hadess svn gnome org]

Author: hadess
Date: Mon Apr  7 11:02:29 2008
New Revision: 5341
URL: http://svn.gnome.org/viewvc/totem?rev=5341&view=rev

Log:
2008-04-07  Bastien Nocera  <hadess hadess net>

	* configure.in:
	* data/Makefile.am: Fix bugreport script not having
	a full-path (Closes: #526664)



Modified:
   branches/gnome-2-22/ChangeLog
   branches/gnome-2-22/configure.in
   branches/gnome-2-22/data/Makefile.am

Modified: branches/gnome-2-22/configure.in
==============================================================================
--- branches/gnome-2-22/configure.in	(original)
+++ branches/gnome-2-22/configure.in	Mon Apr  7 11:02:29 2008
@@ -973,6 +973,23 @@
 GNOME_CXX_WARNINGS
 GNOME_MAINTAINER_MODE_DEFINES
 
+# This macro expands DIR and assigns it to RET.
+# If DIR is NONE, then it's replaced by DEFAULT.
+# Based on AC_DEFINE_DIR
+AC_DEFUN([TOTEM_FULLPATH], [
+  test "x$prefix" = xNONE && prefix="$ac_default_prefix"
+  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+  ac_expand=[$]$1
+  test "x$ac_expand" = xNONE && ac_expand="[$]$2"
+  ac_expand=`eval echo [$]ac_expand`
+  $3=`eval echo [$]ac_expand`
+])
+
+dnl FULL_LIBEXECDIR is used for X-GNOME-Bugzilla-ExtraInfoScript expansion
+dnl in data/totem.desktop.in.in.in
+TOTEM_FULLPATH(libexecdir, NONE, FULL_LIBEXECDIR)
+AC_SUBST(FULL_LIBEXECDIR)
+
 dnl debug
 AC_ARG_ENABLE(debug,
 		AC_HELP_STRING([--disable-debug],[disables compilation of debugging messages]),

Modified: branches/gnome-2-22/data/Makefile.am
==============================================================================
--- branches/gnome-2-22/data/Makefile.am	(original)
+++ branches/gnome-2-22/data/Makefile.am	Mon Apr  7 11:02:29 2008
@@ -44,7 +44,7 @@
 @INTLTOOL_DESKTOP_RULE@
 
 totem.desktop.in: totem.desktop.in.in mime-type-list.txt desktop.sh
-	cat totem.desktop.in.in > $@ &&\
+	cat totem.desktop.in.in | sed 's,@FULL_LIBEXECDIR@,$(FULL_LIBEXECDIR),' > $@ &&\
 	$(SHELL) $(srcdir)/desktop.sh $(srcdir)/mime-type-list.txt	\
 	>> $@