Fix palette and backdrops installation in dt/shared with proper symlinks

diff --git a/cde/programs/backdrops/Makefile.am b/cde/programs/backdrops/Makefile.am
index 36c32871a905440719d413680b81a0b9b13ad0b0..eb91fc1a3c23f27cb820a12b6fd7f46aeb11ac5c 100644 (file)
--- a/cde/programs/backdrops/Makefile.am
+++ b/cde/programs/backdrops/Makefile.am
@@ -1,4 +1,4 @@
-backdropdir = $(CDE_INSTALLATION_TOP)/backdrops
+backdropdir = $(CDE_INSTALLATION_TOP)/share/backdrops
 
 dist_backdrop_DATA = Ankh.bm Crochet.pm Lattice.pm Paver.pm SkyLight.pm \
 Background.bm Foreground.bm Leaves.pm Pebbles.pm Sprinkles.pm \
@@ -6,3 +6,8 @@ BrickWall.bm InlayColor.pm Makefile.am PinStripe.pm SunLogo.pm \
 Concave.pm InlayPlain.pm NoBackdrop.bm RakedSand.bm Toronto.bm \
 Convex.pm KnitLight.pm NoBackdrop.pm RicePaper.pm WaterDrops.pm \
 Corduroy.pm LatticeBig.pm OldChars.pm SkyDark.pm Wooly.pm
+
+install-data-hook:
+       $(RM) $(DESTDIR)$(CDE_INSTALLATION_TOP)/backdrops
+       cd $(DESTDIR)$(CDE_INSTALLATION_TOP)/ && $(LN_S) share/backdrops backdrops
+

diff --git a/cde/programs/localized/C/backdrops/Makefile.am b/cde/programs/localized/C/backdrops/Makefile.am
index 0309d1254503a89647e03c1df74231c839a2c2f7..d51bb47010b2ba158e96b2f5637ea2bc80e786b7 100644 (file)
--- a/cde/programs/localized/C/backdrops/Makefile.am
+++ b/cde/programs/localized/C/backdrops/Makefile.am
@@ -5,7 +5,7 @@ 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
+       $(RM) $(DESTDIR)$(CDE_INSTALLATION_TOP)/share/backdrops/desc.en_US.UTF-8
+       cd $(DESTDIR)$(CDE_INSTALLATION_TOP)/share/backdrops/ && $(LN_S) desc.C desc.en_US.UTF-8
 
 

diff --git a/cde/programs/localized/C/palettes/Makefile.am b/cde/programs/localized/C/palettes/Makefile.am
index 0eb4cdcb87e33a44ee596f5de9e7751760c64e44..9ddc5990d64f33320be6bfb5749e9df4670f52f4 100644 (file)
--- a/cde/programs/localized/C/palettes/Makefile.am
+++ b/cde/programs/localized/C/palettes/Makefile.am
@@ -5,7 +5,7 @@ include ../../templates/palettes.am
 
 # link the C version to en_US.UTF-8
 install-data-hook:
-       $(RM) $(DESTDIR)$(CDE_INSTALLATION_TOP)/palettes/desc.en_US.UTF-8
-       cd $(DESTDIR)$(CDE_INSTALLATION_TOP)/palettes/ && $(LN_S) desc.C desc.en_US.UTF-8
+       $(RM) $(DESTDIR)$(CDE_INSTALLATION_TOP)/share/palettes/desc.en_US.UTF-8
+       cd $(DESTDIR)$(CDE_INSTALLATION_TOP)/share/palettes/ && $(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 4141b31bc10af6aab02d97f54ff9dc3ecf33c6e2..bda1630286b86060e8c0a39b4590da2e3b847599 100644 (file)
--- a/cde/programs/localized/templates/backdrops.am
+++ b/cde/programs/localized/templates/backdrops.am
@@ -3,7 +3,7 @@
 BUILT_SOURCES = desc.$(LANG)
 CLEANFILES = $(BUILT_SOURCES)
 
-backdropsdir = $(CDE_INSTALLATION_TOP)/backdrops
+backdropsdir = $(CDE_INSTALLATION_TOP)/share/backdrops
 dist_backdrops_DATA = $(BUILT_SOURCES)
 
 TOP = $(top_builddir)/programs

diff --git a/cde/programs/localized/templates/palettes.am b/cde/programs/localized/templates/palettes.am
index 815a9c30387e3bd1538baa889c1b320eaae817cb..58b54d270107c8e4b22763d2a891c939d7295afd 100644 (file)
--- a/cde/programs/localized/templates/palettes.am
+++ b/cde/programs/localized/templates/palettes.am
@@ -3,7 +3,7 @@
 BUILT_SOURCES = desc.$(LANG)
 CLEANFILES = $(BUILT_SOURCES)
 
-palettesdir = $(CDE_INSTALLATION_TOP)/palettes
+palettesdir = $(CDE_INSTALLATION_TOP)/share/palettes
 dist_palettes_DATA = $(BUILT_SOURCES)
 
 TOP = $(top_builddir)/programs

diff --git a/cde/programs/palettes/Makefile.am b/cde/programs/palettes/Makefile.am
index a4e65bca4bfcb31d756291620bf3e788a68496af..32abd4be0e3bc7f8820214d8f26873ddd347a085 100644 (file)
--- a/cde/programs/palettes/Makefile.am
+++ b/cde/programs/palettes/Makefile.am
@@ -1,4 +1,4 @@
-palettedir = $(CDE_INSTALLATION_TOP)/palettes
+palettedir = $(CDE_INSTALLATION_TOP)/share/palettes
 
 dist_palette_DATA = Alpine.dp Chocolate.dp Grass.dp PBNJ.dp Tundra.dp  \
        Arizona.dp Cinnamon.dp GrayScale.dp Sand.dp Urchin.dp           \
@@ -8,3 +8,7 @@ dist_palette_DATA = Alpine.dp Chocolate.dp Grass.dp PBNJ.dp Tundra.dp   \
        Default.dp NorthernSky.dp SkyRed.dp Cabernet.dp Delphinium.dp   \
        Nutmeg.dp SoftBlue.dp Camouflage.dp Desert.dp Olive.dp          \
        SouthWest.dp Charcoal.dp Golden.dp Orchid.dp Summer.dp
+
+install-data-hook:
+       $(RM) $(DESTDIR)$(CDE_INSTALLATION_TOP)/palettes
+       cd $(DESTDIR)$(CDE_INSTALLATION_TOP)/ && $(LN_S) share/palettes palettes