[m-rev.] diff: add -r to rm in the dep file

[Peter Ross]

Hi,


===================================================================


Estimated hours taken: 0.15
Branches: main

compiler/modules.m:
	Pass -r to rm as the directory is not always a symbolic link,
	but sometimes it is a real directory on systems which don't
	support symbolic links.


Index: modules.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/modules.m,v
retrieving revision 1.272
diff -u -r1.272 modules.m
--- modules.m	22 May 2003 03:57:10 -0000	1.272
+++ modules.m	26 May 2003 10:20:26 -0000
@@ -4477,7 +4477,7 @@
 		for ext in int int2 int3", Int0Str, OptStr,
 				TransOptStr, DepStr, "; do \\
 			dir=""$(INSTALL_INT_DIR)/Mercury/$${ext}s""; \\
-			rm -f ""$$dir""; \\
+			rm -rf ""$$dir""; \\
 			$(LN_S) .. ""$$dir"" || { \\
 				{ [ -d ""$$dir"" ] || \\
 					$(INSTALL_MKDIR) ""$$dir""; } && \\
@@ -4518,7 +4518,7 @@
 		# `$(INSTALL)'.
 		for ext in ", OptStr, TransOptStr, "; do \\
 			dir=""$(INSTALL_GRADE_INT_DIR)/Mercury/$${ext}s""; \\
-			rm -f ""$$dir""; \\
+			rm -rf ""$$dir""; \\
 			$(LN_S) .. ""$$dir"" || { \\
 				{ [ -d ""$$dir"" ] || \\
 					$(INSTALL_MKDIR) ""$$dir""; } && \\
@@ -4574,7 +4574,7 @@
 		# The following is needed to support the `--use-subdirs' option
 		# We try using `$(LN_S)', but if that fails, then we just use
 		# `$(INSTALL)'.
-		rm -f $(INSTALL_GRADE_INC_SUBDIR)
+		rm -rf $(INSTALL_GRADE_INC_SUBDIR)
 		$(LN_S) .. $(INSTALL_GRADE_INC_SUBDIR) || { \\
 			{ [ -d $(INSTALL_GRADE_INC_SUBDIR) ] || \\
 				$(INSTALL_MKDIR) $(INSTALL_GRADE_INC_SUBDIR); \\
@@ -4582,7 +4582,7 @@
 			$(INSTALL) $(INSTALL_GRADE_INC_DIR)/*.mih \\
 				$(INSTALL_GRADE_INC_SUBDIR); \\
 		} || exit 1
-		rm -f $(INSTALL_INT_DIR)/Mercury/mihs
+		rm -rf $(INSTALL_INT_DIR)/Mercury/mihs
 		$(LN_S) .. $(INSTALL_INT_DIR)/Mercury/mihs || { \\
 			{ [ -d $(INSTALL_INT_DIR)/Mercury/mihs ] || \\
 				$(INSTALL_MKDIR) \\

--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------