From 0cc0766cbd7fbf6a24400200bb31b95848dbb549 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Mon, 2 Dec 2019 19:31:02 -0700 Subject: [PATCH] Get the dt types installed properly on make install --- cde/programs/localized/C/types/Makefile.am | 5 +++++ cde/programs/localized/templates/types.am | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/cde/programs/localized/C/types/Makefile.am b/cde/programs/localized/C/types/Makefile.am index 90dcc38ee..56c8d69e0 100644 --- a/cde/programs/localized/C/types/Makefile.am +++ b/cde/programs/localized/C/types/Makefile.am @@ -3,3 +3,8 @@ MAINTAINERCLEANFILES = Makefile.in include ../../templates/C.am include ../../templates/types.am +# Setup a symlink from C -> en_US.UTF-8 +install-data-hook: + $(RM) $(DESTDIR)$(CDE_INSTALLATION_TOP)/appconfig/types/en_US.UTF-8 + cd $(DESTDIR)$(CDE_INSTALLATION_TOP)/appconfig/types/ && $(LN_S) C en_US.UTF-8 + diff --git a/cde/programs/localized/templates/types.am b/cde/programs/localized/templates/types.am index 0d98615a1..c7169ac32 100644 --- a/cde/programs/localized/templates/types.am +++ b/cde/programs/localized/templates/types.am @@ -12,7 +12,7 @@ BUILT_SOURCES = autoStart.dt user-prefs.dt uxstd.dt dt.dt develop.dt \ DisplayImage.dt DisplayPDF.dt DisplayVideo.dt DisplayPS.dt \ videoTypes.dt Education.dt gcompris.dt geogebra.dt \ stellarium.dt tuxpaint.dt dreamchess.dt eboard.dt Games.dt \ - gcompris.dt ktuberling.dt lbreakout2.dt powermanga.dt \ + ktuberling.dt lbreakout2.dt powermanga.dt \ pychess.dt supertux.dt xboard.dt fontforge.dt gimp.dt \ Graphics.dt inkscape.dt okular.dt xv.dt chromium.dt \ firefox.dt Internet.dt nxclient.dt skype.dt thunderbird.dt \ @@ -28,6 +28,9 @@ BUILT_SOURCES = autoStart.dt user-prefs.dt uxstd.dt dt.dt develop.dt \ CLEANFILES = $(BUILT_SOURCES) +typesdir = $(CDE_INSTALLATION_TOP)/appconfig/types/$(LANG) +dist_types_DATA = $(BUILT_SOURCES) + TOP = $(top_builddir)/programs MERGE = $(top_builddir)/programs/localized/util/merge