lib/compiler.rb in nanoc-1.3 vs lib/compiler.rb in nanoc-1.3.1

@@ -61,11 +61,17 @@
 
     private
 
     # Copies the contents of the assets directory into the output directory
     def copy_assets
-      Dir['assets/*'].each { |f| FileUtils.remove_entry_secure(f.sub('assets/', 'output/'), true) }
-      FileUtils.cp_r(Dir['assets/*'], 'output') if File.directory?('assets') and !Dir['assets/*'].empty?
+      # Create output assets directory if necessary
+      FileUtils.mkdir_p(@config[:output_dir])
+
+      # Remove existing assets
+      Dir['assets/*'].each { |f| FileUtils.remove_entry_secure(f.sub('assets/', @config[:output_dir] + '/'), true) }
+
+      # Copy assets
+      FileUtils.cp_r(Dir['assets/*'], @config[:output_dir]) if File.directory?('assets') and !Dir['assets/*'].empty?
     end
 
     # Returns a list of uncompiled pages
     def uncompiled_pages
       # Read all meta files