GNOME.org
 

tracker r3008 - in trunk/src/plugins: evolution kmail rss

Author: mbiebl
Date: Tue Mar  3 16:14:51 2009
New Revision: 3008
URL: http://svn.gnome.org/viewvc/tracker?rev=3008&view=rev

Log:
- LOCALEDIR is not defined, but localedir is, so use that
- Fix sed expression so "make distcheck" passes.


Modified:
   trunk/src/plugins/evolution/Makefile.am
   trunk/src/plugins/kmail/Makefile.am
   trunk/src/plugins/rss/Makefile.am

Modified: trunk/src/plugins/evolution/Makefile.am
==============================================================================
--- trunk/src/plugins/evolution/Makefile.am	(original)
+++ trunk/src/plugins/evolution/Makefile.am	Tue Mar  3 16:14:51 2009
@@ -3,7 +3,7 @@
 INCLUDES =								\
 	-I$(top_srcdir)/src						\
 	-DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\""			\
-	-DLOCALEDIR="\"$(LOCALEDIR)\""					\
+	-DLOCALEDIR="\"$(localedir)\""					\
 	-DTRACKER_COMPILATION						\
 	$(WARN_CFLAGS)							\
 	$(DBUS_CFLAGS)							\
@@ -15,10 +15,10 @@
 	LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@
 
 %.eplug: %.eplug.in
-	sed -e "s%+PLUGIN_INSTALL_DIR+%$(EVOLUTION_PLUGIN_INSTALL_DIR)%"\
-	-e "s%+GETTEXT_PACKAGE+%$(GETTEXT_PACKAGE)%" 			\
-	-e "s%+LOCALEDIR+%$(LOCALEDIR)%"				\
-	$< > $@
+	sed -e "s|+PLUGIN_INSTALL_DIR+|$(EVOLUTION_PLUGIN_INSTALL_DIR)|"	\
+	    -e "s|+GETTEXT_PACKAGE+|$(GETTEXT_PACKAGE)|"			\
+	    -e "s|+LOCALEDIR+|$(localedir)|"					\
+	    $< > $@
 
 eplugindir = $(EVOLUTION_PLUGIN_INSTALL_DIR)
 

Modified: trunk/src/plugins/kmail/Makefile.am
==============================================================================
--- trunk/src/plugins/kmail/Makefile.am	(original)
+++ trunk/src/plugins/kmail/Makefile.am	Tue Mar  3 16:14:51 2009
@@ -2,7 +2,7 @@
 
 INCLUDES = -I$(top_srcdir)/src						\
 	-DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\""			\
-	-DLOCALEDIR="\"$(LOCALEDIR)\""					\
+	-DLOCALEDIR="\"$(localedir)\""					\
 	-DTRACKER_COMPILATION						\
 	$(WARN_CFLAGS)							\
 	$(DBUS_CFLAGS)							\

Modified: trunk/src/plugins/rss/Makefile.am
==============================================================================
--- trunk/src/plugins/rss/Makefile.am	(original)
+++ trunk/src/plugins/rss/Makefile.am	Tue Mar  3 16:14:51 2009
@@ -2,7 +2,7 @@
 
 INCLUDES = -I$(top_srcdir)/src						\
 	-DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\""			\
-	-DLOCALEDIR="\"$(LOCALEDIR)\""					\
+	-DLOCALEDIR="\"$(localedir)\""					\
 	-DTRACKER_COMPILATION						\
 	$(WARN_CFLAGS)							\
 	$(DBUS_CFLAGS)							\
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]