From 21cf53c0d039f216965bab9ff8f1f39d39523989 Mon Sep 17 00:00:00 2001
From: Jon Trulson <jon@radscan.com>
Date: Wed, 4 Dec 2019 13:21:31 -0700
Subject: [PATCH] Fix palette and backdrops installation in dt/shared with
 proper symlinks

---
 cde/programs/backdrops/Makefile.am             | 7 ++++++-
 cde/programs/localized/C/backdrops/Makefile.am | 4 ++--
 cde/programs/localized/C/palettes/Makefile.am  | 4 ++--
 cde/programs/localized/templates/backdrops.am  | 2 +-
 cde/programs/localized/templates/palettes.am   | 2 +-
 cde/programs/palettes/Makefile.am              | 6 +++++-
 6 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/cde/programs/backdrops/Makefile.am b/cde/programs/backdrops/Makefile.am
index 36c32871a..eb91fc1a3 100644
--- 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 0309d1254..d51bb4701 100644
--- 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 0eb4cdcb8..9ddc5990d 100644
--- 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 4141b31bc..bda163028 100644
--- 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 815a9c303..58b54d270 100644
--- 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 a4e65bca4..32abd4be0 100644
--- 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