aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReuben Thomas <rrt@sc3d.org>2012-05-23 11:43:48 +0100
committerReuben Thomas <rrt@sc3d.org>2012-05-23 11:43:48 +0100
commitdda6b0c82667f0e0a2bac9cf5c611314e0eba15a (patch)
tree7dcbcb83e340bd5a974c104e030f2dec5506df7b
parent8a1299adcc7783dc4e007d4c98dcb767c3fb8f22 (diff)
downloadluarocks-dda6b0c82667f0e0a2bac9cf5c611314e0eba15a.tar.gz
luarocks-dda6b0c82667f0e0a2bac9cf5c611314e0eba15a.tar.bz2
luarocks-dda6b0c82667f0e0a2bac9cf5c611314e0eba15a.zip
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.
-rw-r--r--Makefile6
1 files 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
77 echo "package.path = [[$(LUADIR)/?.lua;$(LUADIR)/?/init.lua;]]..package.path" >> src/bin/$$f ;\ 77 echo "package.path = [[$(LUADIR)/?.lua;$(LUADIR)/?/init.lua;]]..package.path" >> src/bin/$$f ;\
78 cat src/bin/$$f.bak >> src/bin/$$f ;\ 78 cat src/bin/$$f.bak >> src/bin/$$f ;\
79 chmod +x src/bin/$$f ;\ 79 chmod +x src/bin/$$f ;\
80 rm src/bin/$$f.bak ;\ 80 rm -f src/bin/$$f.bak ;\
81 done 81 done
82 82
83built: src/luarocks/site_config.lua build_bins 83built: src/luarocks/site_config.lua build_bins
@@ -97,7 +97,7 @@ check_makefile:
97 echo $(LUAROCKS_FILES) | tr " " "\n" | sort >> makefile_list.txt 97 echo $(LUAROCKS_FILES) | tr " " "\n" | sort >> makefile_list.txt
98 ( cd src/luarocks && find * -name "*.lua" ) | sort >> luarocks_dir.txt 98 ( cd src/luarocks && find * -name "*.lua" ) | sort >> luarocks_dir.txt
99 diff makefile_list.txt luarocks_dir.txt 99 diff makefile_list.txt luarocks_dir.txt
100 rm makefile_list.txt luarocks_dir.txt 100 rm -f makefile_list.txt luarocks_dir.txt
101 @echo 101 @echo
102 @echo "Makefile is sane." 102 @echo "Makefile is sane."
103 @echo 103 @echo
@@ -108,7 +108,7 @@ cleanup_bins:
108 mv src/bin/$$f src/bin/$$f.bak ;\ 108 mv src/bin/$$f src/bin/$$f.bak ;\
109 sed "s,^#!.*lua.*,#!/usr/bin/env lua,;/^package.path/d" < src/bin/$$f.bak > src/bin/$$f ;\ 109 sed "s,^#!.*lua.*,#!/usr/bin/env lua,;/^package.path/d" < src/bin/$$f.bak > src/bin/$$f ;\
110 chmod +x src/bin/$$f ;\ 110 chmod +x src/bin/$$f ;\
111 rm src/bin/$$f.bak ;\ 111 rm -f src/bin/$$f.bak ;\
112 done 112 done
113 113
114clean: cleanup_bins 114clean: cleanup_bins