[gnome-backgrounds] Don't hardcode the install paths

[William Jon McCann <mccann src gnome org>]

commit 88e8c82d794b18ba9048746732d5db3fd34d9fff
Author: William Jon McCann <jmccann redhat com>
Date:   Sun Mar 6 00:49:19 2011 -0500

    Don't hardcode the install paths
    
    Makes it easier to change them in Makefiles.

 abstract/Makefile.am              |    6 ++++--
 abstract/gnome-abstract.xml.in.in |   10 +++++-----
 nature/Makefile.am                |    6 ++++--
 nature/gnome-nature.xml.in.in     |   24 ++++++++++++------------
 4 files changed, 25 insertions(+), 21 deletions(-)
---
diff --git a/abstract/Makefile.am b/abstract/Makefile.am
index d04bb9c..a23969b 100644
--- a/abstract/Makefile.am
+++ b/abstract/Makefile.am
@@ -18,9 +18,11 @@ CLEANFILES = gnome-abstract.xml gnome-abstract.xml.in
 
 EXTRA_DIST = $(background_DATA) gnome-abstract.xml.in.in
 
+edit = sed \
+	-e 's|@BACKGROUNDDIR[ ]|$(backgrounddir)|g'
+
 gnome-abstract.xml.in: gnome-abstract.xml.in.in Makefile
-	$(AM_V_GEN)sed -e 's^\ datadir\@^$(datadir)^g' < $(srcdir)/gnome-abstract.xml.in.in > gnome-abstract.xml.in.tmp \
-	&& mv gnome-abstract.xml.in.tmp gnome-abstract.xml.in
+	$(edit) $< >$@
 
 MAINTAINERCLEANFILES = \
 	Makefile.in
diff --git a/abstract/gnome-abstract.xml.in.in b/abstract/gnome-abstract.xml.in.in
index 0745e34..2b7ef17 100644
--- a/abstract/gnome-abstract.xml.in.in
+++ b/abstract/gnome-abstract.xml.in.in
@@ -3,7 +3,7 @@
 <wallpapers>
 	<wallpaper deleted="false">
 		<_name>Flow</_name>
-		<filename>@datadir@/pixmaps/backgrounds/gnome/abstract/Flow.png</filename>
+		<filename>@BACKGROUNDDIR@/Flow.png</filename>
 		<options>zoom</options>
 		<shade_type>solid</shade_type>
 		<pcolor>#415b69</pcolor>
@@ -11,14 +11,14 @@
 	</wallpaper>
 	<wallpaper deleted="false">
 		<_name>Gulp</_name>
-		<filename>@datadir@/pixmaps/backgrounds/gnome/abstract/Gulp.png</filename>
+		<filename>@BACKGROUNDDIR@/Gulp.png</filename>
 		<shade_type>solid</shade_type>
 		<pcolor>#3a5990</pcolor>
 		<options>zoom</options>
 	</wallpaper>
 	<wallpaper deleted="false">
 		<_name>Silk</_name>
-		<filename>@datadir@/pixmaps/backgrounds/gnome/abstract/Silk.png</filename>
+		<filename>@BACKGROUNDDIR@/Silk.png</filename>
 		<shade_type>horizontal-gradient</shade_type>
 		<pcolor>#FF920E</pcolor>
 		<scolor>#EABC12</scolor>
@@ -26,14 +26,14 @@
 	</wallpaper>
 	<wallpaper deleted="false">
 		<_name>Spring</_name>
-		<filename>@datadir@/pixmaps/backgrounds/gnome/abstract/Spring.png</filename>
+		<filename>@BACKGROUNDDIR@/Spring.png</filename>
 		<shade_type>solid</shade_type>
 		<pcolor>#66BA00</pcolor>
 		<options>zoom</options>
 	</wallpaper>
 	<wallpaper deleted="false">
 		<_name>Waves</_name>
-		<filename>@datadir@/pixmaps/backgrounds/gnome/abstract/Waves.png</filename>
+		<filename>@BACKGROUNDDIR@/Waves.png</filename>
 		<shade_type>solid</shade_type>
 		<pcolor>#1166AA</pcolor>
 		<options>zoom</options>
diff --git a/nature/Makefile.am b/nature/Makefile.am
index 0db10a6..856256e 100644
--- a/nature/Makefile.am
+++ b/nature/Makefile.am
@@ -24,9 +24,11 @@ CLEANFILES = gnome-nature.xml gnome-nature.xml.in
 
 EXTRA_DIST = $(background_DATA) gnome-nature.xml.in.in
 
+edit = sed \
+	-e 's|@BACKGROUNDDIR[ ]|$(backgrounddir)|g'
+
 gnome-nature.xml.in: gnome-nature.xml.in.in Makefile
-	$(AM_V_GEN)sed -e 's^\ datadir\@^$(datadir)^g' < $(srcdir)/gnome-nature.xml.in.in > gnome-nature.xml.in.tmp \
-	&& mv gnome-nature.xml.in.tmp gnome-nature.xml.in
+	$(edit) $< >$@
 
 MAINTAINERCLEANFILES = \
 	Makefile.in
diff --git a/nature/gnome-nature.xml.in.in b/nature/gnome-nature.xml.in.in
index e0f3113..a4a2638 100644
--- a/nature/gnome-nature.xml.in.in
+++ b/nature/gnome-nature.xml.in.in
@@ -5,64 +5,64 @@
 	<!-- Translators: This is the name of a desktop background image that shows an orange/red flower.
 		You might want to translate it into the equivalent words of your language  -->
 		<_name>Fresh Flower</_name>
-		<filename>@datadir@/pixmaps/backgrounds/gnome/nature/FreshFlower.jpg</filename>
+		<filename>@BACKGROUNDDIR@/FreshFlower.jpg</filename>
 		<options>zoom</options>
 	</wallpaper>
 	<wallpaper deleted="false">
 		<!-- Translators: This is the name of a desktop background image that shows a green meadow.
 		  You might want to translate it into the equivalent words of your language  -->
 		<_name>Green Meadow</_name>
-		<filename>@datadir@/pixmaps/backgrounds/gnome/nature/GreenMeadow.jpg</filename>
+		<filename>@BACKGROUNDDIR@/GreenMeadow.jpg</filename>
 		<options>zoom</options>
 	</wallpaper>
 	<wallpaper deleted="false">
 		<_name>Aqua</_name>
-		<filename>@datadir@/pixmaps/backgrounds/gnome/nature/Aqua.jpg</filename>
+		<filename>@BACKGROUNDDIR@/Aqua.jpg</filename>
 		<options>zoom</options>
 	</wallpaper>
 	<wallpaper deleted="false">
 		<_name>Dune</_name>
-		<filename>@datadir@/pixmaps/backgrounds/gnome/nature/Dune.jpg</filename>
+		<filename>@BACKGROUNDDIR@/Dune.jpg</filename>
 		<options>zoom</options>
 	</wallpaper>
 	<wallpaper deleted="false">
 		<_name>Storm</_name>
-		<filename>@datadir@/pixmaps/backgrounds/gnome/nature/Storm.jpg</filename>
+		<filename>@BACKGROUNDDIR@/Storm.jpg</filename>
 		<options>zoom</options>
 	</wallpaper>
 	<wallpaper deleted="false">
 		<_name>Two Wings</_name>
-		<filename>@datadir@/pixmaps/backgrounds/gnome/nature/TwoWings.jpg</filename>
+		<filename>@BACKGROUNDDIR@/TwoWings.jpg</filename>
 		<options>zoom</options>
 	</wallpaper>
 	<wallpaper deleted="false">
 		<_name>Lady Bird</_name>
-		<filename>@datadir@/pixmaps/backgrounds/gnome/nature/LadyBird.jpg</filename>
+		<filename>@BACKGROUNDDIR@/LadyBird.jpg</filename>
 		<options>zoom</options>
 	</wallpaper>
 	<wallpaper deleted="false">
 		<_name>Blinds</_name>
-		<filename>@datadir@/pixmaps/backgrounds/gnome/nature/Blinds.jpg</filename>
+		<filename>@BACKGROUNDDIR@/Blinds.jpg</filename>
 		<options>zoom</options>
 	</wallpaper>
 	<wallpaper deleted="false">
 		<_name>Rain Drops</_name>
-		<filename>@datadir@/pixmaps/backgrounds/gnome/nature/RainDrops.jpg</filename>
+		<filename>@BACKGROUNDDIR@/RainDrops.jpg</filename>
 		<options>zoom</options>
 	</wallpaper>
 	<wallpaper deleted="false">
 		<_name>Yellow Flower</_name>
-		<filename>@datadir@/pixmaps/backgrounds/gnome/nature/YellowFlower.jpg</filename>
+		<filename>@BACKGROUNDDIR@/YellowFlower.jpg</filename>
 		<options>zoom</options>
 	</wallpaper>
 	<wallpaper deleted="false">
 		<_name>Garden</_name>
-		<filename>@datadir@/pixmaps/backgrounds/gnome/nature/Garden.jpg</filename>
+		<filename>@BACKGROUNDDIR@/Garden.jpg</filename>
 		<options>zoom</options>
 	</wallpaper>
 	<wallpaper deleted="false">
 		<_name>Wood</_name>
-		<filename>@datadir@/pixmaps/backgrounds/gnome/nature/Wood.jpg</filename>
+		<filename>@BACKGROUNDDIR@/Wood.jpg</filename>
 		<options>zoom</options>
 	</wallpaper>
 </wallpapers>