cheese r933 - in trunk: . data

[dgsiegel svn gnome org]

Author: dgsiegel
Date: Mon Aug 18 18:32:38 2008
New Revision: 933
URL: http://svn.gnome.org/viewvc/cheese?rev=933&view=rev

Log:
fix some dbus-autotool regression, which prevented building cheese correctly


Removed:
   trunk/acinclude.m4
Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/data/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Aug 18 18:32:38 2008
@@ -35,13 +35,6 @@
   $3=`eval echo [$]ac_expand`
 ])
 
-#dbus
-AS_AC_EXPAND(DATADIR, $datadir)
-
-DBUS_SERVICES_DIR="$DATADIR/dbus-1/services"
-AC_SUBST(DBUS_SERVICES_DIR)
-AC_DEFINE_UNQUOTED(DBUS_SERVICES_DIR, "$DBUS_SERVICES_DIR", [Where services dir for DBUS is])
-
 # FULL_LIBEXECDIR is used for X-GNOME-Bugzilla-ExtraInfoScript expansion
 # in data/cheese.desktop.in.in
 CHEESE_FULLPATH(libexecdir, NONE, FULL_LIBEXECDIR)

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Mon Aug 18 18:32:38 2008
@@ -13,30 +13,31 @@
 gtkrcdir = $(pkgdatadir)
 gtkrc_DATA = gtkrc
 
-pkgdata_DATA =						\
-	cheese.ui					\
+# Dbus service file
+servicedir = $(datadir)/dbus-1/services
+service_in_files = org.gnome.Cheese.service.in
+service_DATA = $(service_in_files:.service.in=.service)
+ 
+# Rule to make the service file with bindir expanded
+$(service_DATA): $(service_in_files) Makefile
+	@sed -e "s|\ bindir\@|$(bindir)|" $< > $@
+
+pkgdata_DATA = \
+	cheese.ui	\
 	cheese-ui.xml \
 	cheese-prefs.ui
 
-EXTRA_DIST =						\
-	$(desktop_in_files)				\
-	$(schema_in_files)				\
-	$(pkgdata_DATA)				\
-	$(gtkrc_DATA)					\
+EXTRA_DIST = \
+	$(desktop_in_files) \
+	$(schema_in_files) \
+	$(service_in_files) \
+	$(pkgdata_DATA) \
+	$(gtkrc_DATA) \
 	$(bugreport_SCRIPTS)
 
 bugreportdir      = $(libexecdir)/cheese
 bugreport_SCRIPTS = cheese-bugreport.sh
 
-# Dbus service file
-servicedir = $(DBUS_SERVICES_DIR)
-service_in_files = org.gnome.Cheese.service.in
-service_DATA = $(service_in_files:.service.in=.service)
-
-# Rule to make the service file with bindir expanded
-$(service_DATA): $(service_in_files) Makefile
-	@sed -e "s|@bindir@|$(bindir)|" $<> $@
-
 if GCONF_SCHEMAS_INSTALL
 install-data-local:
 	-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
@@ -52,7 +53,7 @@
 clean-local :
 	rm -f *~
 
-DISTCLEANFILES =					\
-	cheese.desktop  				\
-	cheese.schemas
-
+DISTCLEANFILES = \
+	cheese.desktop \
+	cheese.schemas \
+	org.gnome.Cheese.service