From 41d211952ce549f13bc119e27f9b690f625f53d3 Mon Sep 17 00:00:00 2001
From: John MacFarlane <fiddlosopher@gmail.com>
Date: Fri, 23 Jan 2015 14:39:23 -0800
Subject: Put generated commonmark.js in js/dist/ rather than js/.

---
 Makefile     | 10 +++++-----
 js/README.md |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 93fa353..8800de5 100644
--- a/Makefile
+++ b/Makefile
@@ -118,7 +118,7 @@ operf: $(PROG)
 	operf $(PROG) <$(BENCHINP) >/dev/null
 
 distclean: clean
-	-rm -f js/commonmark.js
+	-rm -f js/dist/commonmark.js
 	-rm -rf *.dSYM
 	-rm -f README.html
 	-rm -f spec.md fuzz.txt spec.html
@@ -126,7 +126,7 @@ distclean: clean
 
 ### JavaScript ###
 
-js/commonmark.js: js/lib/index.js ${JSMODULES}
+js/dist/commonmark.js: js/lib/index.js ${JSMODULES}
 	browserify --standalone commonmark $< -o $@
 
 testjs: $(SPEC)
@@ -144,7 +144,7 @@ benchjs:
 npm:
 	cd js; npm publish
 
-dingus: js/commonmark.js
+dingus: js/dist/commonmark.js
 	echo "Starting dingus server at http://localhost:9000/dingus.html" && python -m SimpleHTTPServer 9000
 
 ### Spec ###
@@ -163,8 +163,8 @@ spec.pdf: spec.md tools/template.tex tools/specfilter.hs
 
 ### Website ###
 
-update-site: spec js/commonmark.js
+update-site: spec js/dist/commonmark.js
 	make -C $(SITE) update
 
-upload-site: spec js/commonmark.js
+upload-site: spec js/dist/commonmark.js
 	make -C $(SITE) upload
diff --git a/js/README.md b/js/README.md
index a556395..c80ea9e 100644
--- a/js/README.md
+++ b/js/README.md
@@ -23,7 +23,7 @@ This package includes the commonmark library and a
 command-line executable, `commonmark`.
 
 For client-side use, you can do `make browserify` to produce
-a standalone JavaScript file `js/commonmark.js`,
+a standalone JavaScript file `js/dist/commonmark.js`,
 suitable for linking into a web page, or just fetch
 <http://spec.commonmark.org/js/commonmark.js>.
 
-- 
cgit v1.2.3