Get the palettes installed properly on make install

diff --git a/cde/configure.ac b/cde/configure.ac
index 0377d336edf4ad778a7f870e5b8275b974a3d528..00b7a444d642e3a6651c68334c441ef3de796831 100644 (file)
--- 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 e41a0cf1ebbf50a932c75d7302e478b9648e4cd7..0eb4cdcb87e33a44ee596f5de9e7751760c64e44 100644 (file)
--- 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 b4d1c93e0d0e72e918fef2913edb6585c85ac19d..815a9c30387e3bd1538baa889c1b320eaae817cb 100644 (file)
--- 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 (file)
index 0000000..a4e65bc
--- /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