From: Jon Trulson <jon@radscan.com>
Date: Mon, 2 Dec 2019 05:26:47 +0000 (-0700)
Subject: Get app-defaults installing correctly
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d7a734c1717b37b18d6fd606798b3b7643817fb1;p=oweals%2Fcde.git

Get app-defaults installing correctly
---

diff --git a/cde/programs/localized/C/app-defaults/Makefile.am b/cde/programs/localized/C/app-defaults/Makefile.am
index ac572d34..16f2b5e4 100644
--- a/cde/programs/localized/C/app-defaults/Makefile.am
+++ b/cde/programs/localized/C/app-defaults/Makefile.am
@@ -3,3 +3,10 @@ MAINTAINERCLEANFILES = Makefile.in
 include ../../templates/C.am
 include ../../templates/app-defaults.am
 
+# Setup a symlink from C -> en_US.UTF-8
+install-data-hook:
+	$(RM) $(DESTDIR)$(CDE_INSTALLATION_TOP)/app-defaults/en_US.UTF-8
+	cd $(DESTDIR)$(CDE_INSTALLATION_TOP)/app-defaults/ && $(LN_S) C en_US.UTF-8
+
+
+
diff --git a/cde/programs/localized/templates/app-defaults.am b/cde/programs/localized/templates/app-defaults.am
index 520d5000..c027ce3b 100644
--- a/cde/programs/localized/templates/app-defaults.am
+++ b/cde/programs/localized/templates/app-defaults.am
@@ -12,6 +12,10 @@ BUILT_SOURCES = Dthelpview Dtimsstart Dtlogin Dthello Dtsession		\
 
 CLEANFILES = $(BUILT_SOURCES)
 
+appdefdir = $(CDE_INSTALLATION_TOP)/app-defaults/$(LANG)
+appdef_DATA = $(BUILT_SOURCES)
+EXTRA_DIST = $(BUILT_SOURCES)
+
 TOP = $(top_builddir)/programs
 DTSVCSRC = $(top_builddir)/lib/DtSvc
 MERGE = $(top_builddir)/programs/localized/util/merge