Install backdrops in proper location, install localization for them

diff --git a/cde/programs/backdrops/Makefile.am b/cde/programs/backdrops/Makefile.am
index a135b2f4b63244cdc7d1048752aad34c80cd99ff..36c32871a905440719d413680b81a0b9b13ad0b0 100644 (file)
--- a/cde/programs/backdrops/Makefile.am
+++ b/cde/programs/backdrops/Makefile.am
@@ -1,4 +1,4 @@
-backdropdir = ${prefix}/share/backdrops
+backdropdir = $(CDE_INSTALLATION_TOP)/backdrops
 
 dist_backdrop_DATA = Ankh.bm Crochet.pm Lattice.pm Paver.pm SkyLight.pm \
 Background.bm Foreground.bm Leaves.pm Pebbles.pm Sprinkles.pm \

diff --git a/cde/programs/localized/C/backdrops/Makefile.am b/cde/programs/localized/C/backdrops/Makefile.am
index fee4896cbde0074f793d3a2ea2a380ae62e7c1f5..0309d1254503a89647e03c1df74231c839a2c2f7 100644 (file)
--- a/cde/programs/localized/C/backdrops/Makefile.am
+++ b/cde/programs/localized/C/backdrops/Makefile.am
@@ -3,3 +3,9 @@ MAINTAINERCLEANFILES = Makefile.in
 include ../../templates/C.am
 include ../../templates/backdrops.am
 
+# Setup a symlink from C -> en_US.UTF-8
+install-data-hook:
+       $(RM) $(DESTDIR)$(CDE_INSTALLATION_TOP)/backdrops/desc.en_US.UTF-8
+       cd $(DESTDIR)$(CDE_INSTALLATION_TOP)/backdrops/ && $(LN_S) desc.C desc.en_US.UTF-8
+
+

diff --git a/cde/programs/localized/templates/backdrops.am b/cde/programs/localized/templates/backdrops.am
index 635310ed2159d1a5495caeb0d328e4c9e04080f3..4141b31bc10af6aab02d97f54ff9dc3ecf33c6e2 100644 (file)
--- a/cde/programs/localized/templates/backdrops.am
+++ b/cde/programs/localized/templates/backdrops.am
@@ -1,9 +1,11 @@
 # process the backdrop file...
 
 BUILT_SOURCES = desc.$(LANG)
-
 CLEANFILES = $(BUILT_SOURCES)
 
+backdropsdir = $(CDE_INSTALLATION_TOP)/backdrops
+dist_backdrops_DATA = $(BUILT_SOURCES)
+
 TOP = $(top_builddir)/programs
 MERGE = $(top_builddir)/programs/localized/util/merge