Generate bindata from assets dir, not templates

Makefile

@@ -4,8 +4,8 @@ dist/go-httpbin: assets *.go httpbin/*.go
 	mkdir -p dist
 	go build -o dist/go-httpbin
 
-assets: httpbin/templates/*.html
-	go-bindata -o httpbin/templates.go -pkg=httpbin -prefix=httpbin/templates httpbin/templates
+assets: httpbin/assets/*
+	go-bindata -o httpbin/assets.go -pkg=httpbin -prefix=httpbin/assets httpbin/assets
 
 test:
 	go test -v github.com/mccutchen/go-httpbin/httpbin

httpbin/templates.go → httpbin/assets.go

 // Code generated by go-bindata.
 // sources:
-// httpbin/templates/forms-post.html
-// httpbin/templates/index.html
-// httpbin/templates/moby.html
-// httpbin/templates/utf8.html
+// httpbin/assets/forms-post.html
+// httpbin/assets/index.html
+// httpbin/assets/moby.html
+// httpbin/assets/utf8.html
 // DO NOT EDIT!
 
 package httpbin
@@ -204,9 +204,9 @@ func AssetNames() []string {
 // _bindata is a table, holding each asset generator, mapped to its name.
 var _bindata = map[string]func() (*asset, error){
 	"forms-post.html": formsPostHtml,
-	"index.html": indexHtml,
-	"moby.html": mobyHtml,
-	"utf8.html": utf8Html,
+	"index.html":      indexHtml,
+	"moby.html":       mobyHtml,
+	"utf8.html":       utf8Html,
 }
 
 // AssetDir returns the file names below a certain
@@ -248,11 +248,12 @@ type bintree struct {
 	Func     func() (*asset, error)
 	Children map[string]*bintree
 }
+
 var _bintree = &bintree{nil, map[string]*bintree{
 	"forms-post.html": &bintree{formsPostHtml, map[string]*bintree{}},
-	"index.html": &bintree{indexHtml, map[string]*bintree{}},
-	"moby.html": &bintree{mobyHtml, map[string]*bintree{}},
-	"utf8.html": &bintree{utf8Html, map[string]*bintree{}},
+	"index.html":      &bintree{indexHtml, map[string]*bintree{}},
+	"moby.html":       &bintree{mobyHtml, map[string]*bintree{}},
+	"utf8.html":       &bintree{utf8Html, map[string]*bintree{}},
 }}
 
 // RestoreAsset restores an asset under the given directory
@@ -301,4 +302,3 @@ func _filePath(dir, name string) string {
 	cannonicalName := strings.Replace(name, "\\", "/", -1)
 	return filepath.Join(append([]string{dir}, strings.Split(cannonicalName, "/")...)...)
 }
-