Merge pull request #290 from grn/master

Cakefile and CLI bug fixes
jashkenas · Jun 12, 2014 · 58101d3 · 58101d3
2 parents e52ba68 + d4042b2
commit 58101d3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Cakefile b/Cakefile
@@ -15,8 +15,8 @@ task 'install', 'install the `docco` command into /usr/local (or --prefix)', (op
   base = options.prefix or '/usr/local'
   lib  = base + '/lib/docco'
   exec([
-    'mkdir -p ' + lib
-    'cp -rf bin README resources lib ' + lib
+    'mkdir -p ' + lib + ' ' + base + '/bin'
+    'cp -rf bin README resources ' + lib
     'ln -sf ' + lib + '/bin/docco ' + base + '/bin/docco'
   ].join(' && '), (err, stdout, stderr) ->
    if err then console.error stderr

diff --git a/docco.js b/docco.js
diff --git a/docco.litcoffee b/docco.litcoffee
@@ -225,7 +225,7 @@ user-specified options.
       css:        null
       extension:  null
       languages:  {}
-      marked: {}
+      marked:     null
 
 **Configure** this particular run of Docco. We might use a passed-in external
 template, or one of the built-in **layouts**. We only attempt to process