From 5823e95e033e5e0526fa01200ddbe364e997c643 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Mon, 2 Dec 2019 13:08:52 -0700 Subject: [PATCH 1/1] Install backdrops in proper location, install localization for them --- cde/programs/backdrops/Makefile.am | 2 +- cde/programs/localized/C/backdrops/Makefile.am | 6 ++++++ cde/programs/localized/templates/backdrops.am | 4 +++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/cde/programs/backdrops/Makefile.am b/cde/programs/backdrops/Makefile.am index a135b2f4..36c32871 100644 --- 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 fee4896c..0309d125 100644 --- 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 635310ed..4141b31b 100644 --- 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 -- 2.25.1