cheese r486 - in trunk: . data

[jhaitsma svn gnome org]

Author: jhaitsma
Date: Thu Feb  7 20:50:50 2008
New Revision: 486
URL: http://svn.gnome.org/viewvc/cheese?rev=486&view=rev

Log:
Install bugreport script in libexec instead of lib Fixes bug #514833


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/data/Makefile.am
   trunk/data/cheese.desktop.in.in

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Thu Feb  7 20:50:50 2008
@@ -33,10 +33,10 @@
   $3=`eval echo [$]ac_expand`
 ])
 
-# FULL_LIBDIR is used for X-GNOME-Bugzilla-ExtraInfoScript expansion
+# FULL_LIBEXECDIR is used for X-GNOME-Bugzilla-ExtraInfoScript expansion
 # in data/cheese.desktop.in.in
-CHEESE_FULLPATH(libdir, NONE, FULL_LIBDIR)
-AC_SUBST(FULL_LIBDIR)
+CHEESE_FULLPATH(libexecdir, NONE, FULL_LIBEXECDIR)
+AC_SUBST(FULL_LIBEXECDIR)
 
 #*******************************************************************************
 # Internationalization

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Thu Feb  7 20:50:50 2008
@@ -21,7 +21,7 @@
 	$(pkgdata_DATA)				\
 	$(bugreport_SCRIPTS)
 
-bugreportdir      = $(libdir)/cheese
+bugreportdir      = $(libexecdir)/cheese
 bugreport_SCRIPTS = cheese-bugreport.sh
 
 if GCONF_SCHEMAS_INSTALL

Modified: trunk/data/cheese.desktop.in.in
==============================================================================
--- trunk/data/cheese.desktop.in.in	(original)
+++ trunk/data/cheese.desktop.in.in	Thu Feb  7 20:50:50 2008
@@ -11,4 +11,4 @@
 X-GNOME-Bugzilla-Product=cheese
 X-GNOME-Bugzilla-Component=general
 X-GNOME-Bugzilla-Version= VERSION@
-X-GNOME-Bugzilla-ExtraInfoScript= FULL_LIBDIR@/cheese/cheese-bugreport.sh
+X-GNOME-Bugzilla-ExtraInfoScript= FULL_LIBEXECDIR@/cheese/cheese-bugreport.sh