From c2e14bf88e6e32e16dd83b0d67d4dcb6a169cbee Mon Sep 17 00:00:00 2001
From: Brandon Mathis <brandon@imathis.com>
Date: Sun, 17 Jun 2012 09:36:56 -0500
Subject: [PATCH] Added combined javascript to .gitignore. Rake minify now uses
 configuration for the source directory

---
 .gitignore | 1 +
 Rakefile   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index f28bbe4..9f83a0e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@ sass.old
 source.old
 source/_stash
 source/stylesheets/screen.css
+source/javascripts/octopress.min.js
 source/images/icon-*.png
 vendor
 node_modules
diff --git a/Rakefile b/Rakefile
index 82091c3..15f5d2f 100644
--- a/Rakefile
+++ b/Rakefile
@@ -61,9 +61,9 @@ task :generate do
 end
 
 Rake::Minify.new(:minify_and_combine) do
-  files = FileList.new("source/javascripts/group/*.*")
+  files = FileList.new("#{source_dir}/javascripts/group/*.*")
 
-  output_file =  "source/javascripts/octopress.min.js"
+  output_file =  "#{source_dir}/javascripts/octopress.min.js"
 
   puts "BEGIN Minifying #{output_file}"
   group(output_file) do