add zip to git ignore, and fix gh-pages make

diff --git a/.gitignore b/.gitignore
index 5e8b7abb9e00d3284c08ba6169d01b6457c79a00..4086ceec5226c5a5b0946d9d3d35b32fdea074ee 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 *.rej
 *.swo
 *.swp
+*.zip
 *.vi
 *~
 *.sass-cache

diff --git a/Makefile b/Makefile
index 038629468dd88b8859ce8ed730462d7dd55c2d68..78d1a840799b0ceb0776d13c60066324e22264bd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -42,7 +42,7 @@ bootstrap:
 #
 
 gh-pages: bootstrap docs
-       rm docs/assets/bootstrap.zip
+       rm -f docs/assets/bootstrap.zip
        zip -r docs/assets/bootstrap.zip bootstrap
        rm -r bootstrap
        rm -f ../bootstrap-gh-pages/assets/bootstrap.zip