ekiga r6778 - in trunk: . pixmaps src

[jpuydt svn gnome org]

Author: jpuydt
Date: Mon Sep  1 18:42:13 2008
New Revision: 6778
URL: http://svn.gnome.org/viewvc/ekiga?rev=6778&view=rev

Log:
Fixed #414266

Modified:
   trunk/ChangeLog
   trunk/pixmaps/Makefile.am
   trunk/src/Makefile.am

Modified: trunk/pixmaps/Makefile.am
==============================================================================
--- trunk/pixmaps/Makefile.am	(original)
+++ trunk/pixmaps/Makefile.am	Mon Sep  1 18:42:13 2008
@@ -86,7 +86,7 @@
 	gm_phone_pick_up_stock_data_16 $(srcdir)/16x16/phone-pick-up.png 
 
 
-noinst_DATA = inlines.h
+noinst_SOURCES = inlines.h
 
 EXTRA_DIST= $(IMAGES_FILES)
 

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Mon Sep  1 18:42:13 2008
@@ -143,17 +143,15 @@
 endif
 
 if INSTALL_DBUS_SERVICE
-servicedir = $(datadir)/dbus-1/services
-service_in_files = \
-	components/org.ekiga.Ekiga.service.in \
-	components/org.ekiga.Helper.service.in
-service_DATA = $(service_in_files:.service.in=.service)
 
-components/org.ekiga.Ekiga.service: components/org.ekiga.Ekiga.service.in
-	(cd $(srcdir) && sed -e 's#\ bindir\@# bindir@#' $<) > $@
+%.service: %.service.in
+	$(MKDIR_P) components # this is ugly...
+	sed -e "s#\ bindir\@# bindir@#" $< > $@
+
+servicedir = $(datadir)/dbus-1/services
+service_DATA = components/org.ekiga.Ekiga.service components/org.ekiga.Helper.service
+service_in_files = $(service_DATA:.service=.service.in)
 
-components/org.ekiga.Helper.service: components/org.ekiga.Helper.service.in
-	(cd $(srcdir) && sed -e 's#\ bindir\@# bindir@#' $<) > $@
 endif
 
 AM_CXXFLAGS = $(GTK_CFLAGS) $(GLIB_CFLAGS) $(GNOME_CFLAGS) $(DBUS_CFLAGS) $(BONOBO_CFLAGS) $(OPAL_CFLAGS) $(PTLIB_CFLAGS) $(SIGC_CFLAGS) $(XML_CFLAGS)