From: Jon Trulson <jon@radscan.com>
Date: Tue, 3 Dec 2019 02:20:36 +0000 (-0700)
Subject: Get the palettes installed properly on make install
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c6b31ebd5fa74920034f8dbaf84ae27f66379ba0;p=oweals%2Fcde.git

Get the palettes installed properly on make install
---

diff --git a/cde/configure.ac b/cde/configure.ac
index 0377d336..00b7a444 100644
--- a/cde/configure.ac
+++ b/cde/configure.ac
@@ -363,6 +363,8 @@ programs/Makefile
 
 programs/backdrops/Makefile
 
+programs/palettes/Makefile
+
 programs/icons/Makefile
 
 programs/dthelp/Makefile
diff --git a/cde/programs/localized/C/palettes/Makefile.am b/cde/programs/localized/C/palettes/Makefile.am
index e41a0cf1..0eb4cdcb 100644
--- a/cde/programs/localized/C/palettes/Makefile.am
+++ b/cde/programs/localized/C/palettes/Makefile.am
@@ -3,3 +3,9 @@ MAINTAINERCLEANFILES = Makefile.in
 include ../../templates/C.am
 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
+
+
diff --git a/cde/programs/localized/templates/palettes.am b/cde/programs/localized/templates/palettes.am
index b4d1c93e..815a9c30 100644
--- a/cde/programs/localized/templates/palettes.am
+++ b/cde/programs/localized/templates/palettes.am
@@ -1,9 +1,11 @@
 # process the palettes file...
 
 BUILT_SOURCES = desc.$(LANG)
-
 CLEANFILES = $(BUILT_SOURCES)
 
+palettesdir = $(CDE_INSTALLATION_TOP)/palettes
+dist_palettes_DATA = $(BUILT_SOURCES)
+
 TOP = $(top_builddir)/programs
 MERGE = $(top_builddir)/programs/localized/util/merge
 
diff --git a/cde/programs/palettes/Makefile.am b/cde/programs/palettes/Makefile.am
new file mode 100644
index 00000000..a4e65bca
--- /dev/null
+++ b/cde/programs/palettes/Makefile.am
@@ -0,0 +1,10 @@
+palettedir = $(CDE_INSTALLATION_TOP)/palettes
+
+dist_palette_DATA = Alpine.dp Chocolate.dp Grass.dp PBNJ.dp Tundra.dp	\
+	Arizona.dp Cinnamon.dp GrayScale.dp Sand.dp Urchin.dp		\
+	BeigeRose.dp Clay.dp Lilac.dp SantaFe.dp Wheat.dp Black.dp	\
+	Crimson.dp Mustard.dp Savannah.dp WhiteBlack.dp BlackWhite.dp	\
+	DarkGold.dp Neptune.dp SeaFoam.dp White.dp Broica.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