Merge branch 'jekyll-compatibility' into combined-fixes

Signed-off-by: Sven Strickroth <[email protected]>

Author: csware

jekyll-multisite.gemspec

@@ -10,6 +10,6 @@ Gem::Specification.new do |s|
   s.homepage = 'http://penguindreams.org'
   s.license = 'GPL-3.0'
   s.files = ['lib/jekyll-multisite.rb']
-  s.add_runtime_dependency 'jekyll', '~> 3.0', '>= 3.0.1'
+  s.add_runtime_dependency 'jekyll', '>= 3.2', '<= 4.0'
   s.add_runtime_dependency 'jekyll-paginate', '~> 1.1.0'
 end

lib/jekyll-multisite.rb

@@ -102,6 +102,10 @@ def self.sync_dir(cur, base,  dest)
     end
   end
 
+  Jekyll::Hooks.register :site, :after_init do |site|
+    site.includes_load_paths << File.join(site.source, File.join('../', site.config["includes_dir"].to_s))
+  end
+
   Jekyll::Hooks.register :site, :post_write do |site|
     base_shared = File.basename(site.config['shared_dir'])
     shared_dir = File.join(site.dest, base_shared)