From 2d355712eadd50c29e5889aceaa2faf464586a75 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Sat, 6 Aug 2022 12:24:10 -0600 Subject: [PATCH] C locales: recursively delete C locale directories on make install In previous versions of CDE (<2.5.0), these were directories with en_US symlinked to them. Attempting to do a 'make install' with 2.5.0 would yield errors since only a non-recursive 'rm' was being done. On 2.5.0+, these are symlinks to the en_US versions now. --- cde/doc/en_US.UTF-8/guides/Makefile.am | 2 +- cde/doc/en_US.UTF-8/help/Makefile.am | 2 +- cde/programs/localized/C/msg/Makefile.am | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cde/doc/en_US.UTF-8/guides/Makefile.am b/cde/doc/en_US.UTF-8/guides/Makefile.am index 776dc50c4..c07f3dd97 100644 --- a/cde/doc/en_US.UTF-8/guides/Makefile.am +++ b/cde/doc/en_US.UTF-8/guides/Makefile.am @@ -73,5 +73,5 @@ CLEANFILES += $(cdedti_DATA) $(cdedtidoc_DATA) $(cdedtidocsearch_DATA) # link the en_US.UTF-8 version to C install-data-hook: - $(RM) $(DESTDIR)$(CDE_INSTALLATION_TOP)/infolib/C + $(RM) -rf $(DESTDIR)$(CDE_INSTALLATION_TOP)/infolib/C cd $(DESTDIR)$(CDE_INSTALLATION_TOP)/infolib && $(LN_S) en_US.UTF-8 C diff --git a/cde/doc/en_US.UTF-8/help/Makefile.am b/cde/doc/en_US.UTF-8/help/Makefile.am index b9f15fac3..898dc0676 100644 --- a/cde/doc/en_US.UTF-8/help/Makefile.am +++ b/cde/doc/en_US.UTF-8/help/Makefile.am @@ -13,5 +13,5 @@ include $(top_srcdir)/doc/common/help/sdl-data.am # need to setup a symlink for the C locale to point toward en_US install-data-hook: - $(RM) $(DESTDIR)$(CDE_INSTALLATION_TOP)/appconfig/help/C + $(RM) -rf $(DESTDIR)$(CDE_INSTALLATION_TOP)/appconfig/help/C cd $(DESTDIR)$(CDE_INSTALLATION_TOP)/appconfig/help/ && $(LN_S) en_US.UTF-8 C diff --git a/cde/programs/localized/C/msg/Makefile.am b/cde/programs/localized/C/msg/Makefile.am index 4d1730ce4..bade8fa17 100644 --- a/cde/programs/localized/C/msg/Makefile.am +++ b/cde/programs/localized/C/msg/Makefile.am @@ -5,5 +5,5 @@ include ../../templates/msg.C.am # Setup a symlink from C -> en_US.UTF-8 install-data-hook: - $(RM) $(DESTDIR)$(CDE_INSTALLATION_TOP)/lib/nls/msg/en_US.UTF-8 + $(RM) -rf $(DESTDIR)$(CDE_INSTALLATION_TOP)/lib/nls/msg/en_US.UTF-8 cd $(DESTDIR)$(CDE_INSTALLATION_TOP)/lib/nls/msg/ && $(LN_S) C en_US.UTF-8