From dda6b0c82667f0e0a2bac9cf5c611314e0eba15a Mon Sep 17 00:00:00 2001 From: Reuben Thomas Date: Wed, 23 May 2012 11:43:48 +0100 Subject: Add -f to some more rm commands which should never fail. The clean target can be run even if the relevant files have not been created, so the rm shouldn't fail. --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 281ef8ca..44d677c0 100644 --- a/Makefile +++ b/Makefile @@ -77,7 +77,7 @@ build_bins: cleanup_bins echo "package.path = [[$(LUADIR)/?.lua;$(LUADIR)/?/init.lua;]]..package.path" >> src/bin/$$f ;\ cat src/bin/$$f.bak >> src/bin/$$f ;\ chmod +x src/bin/$$f ;\ - rm src/bin/$$f.bak ;\ + rm -f src/bin/$$f.bak ;\ done built: src/luarocks/site_config.lua build_bins @@ -97,7 +97,7 @@ check_makefile: echo $(LUAROCKS_FILES) | tr " " "\n" | sort >> makefile_list.txt ( cd src/luarocks && find * -name "*.lua" ) | sort >> luarocks_dir.txt diff makefile_list.txt luarocks_dir.txt - rm makefile_list.txt luarocks_dir.txt + rm -f makefile_list.txt luarocks_dir.txt @echo @echo "Makefile is sane." @echo @@ -108,7 +108,7 @@ cleanup_bins: mv src/bin/$$f src/bin/$$f.bak ;\ sed "s,^#!.*lua.*,#!/usr/bin/env lua,;/^package.path/d" < src/bin/$$f.bak > src/bin/$$f ;\ chmod +x src/bin/$$f ;\ - rm src/bin/$$f.bak ;\ + rm -f src/bin/$$f.bak ;\ done clean: cleanup_bins -- cgit v1.2.3-55-g6feb