Browse Source

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.
Jon Trulson 1 year ago
parent
commit
2d355712ea

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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