Put main.hs in app, no dist hardcoding

yesod/Scaffolding/Scaffolder.hs

@@ -137,7 +137,8 @@ scaffold = do
     mkDir "deploy"
     mkDir "Settings"
     mkDir "messages"
-     
+    mkDir "app"
+
     writeFile' "deploy/Procfile" $(codegen "deploy/Procfile")
 
     case backend of
@@ -148,7 +149,7 @@ scaffold = do
 
     writeFile' "config/settings.yml" $(codegen "config/settings.yml")
     writeFile' "config/keter.yaml" $(codegen "config/keter.yaml")
-    writeFile' "main.hs" $(codegen "main.hs")
+    writeFile' "app/main.hs" $(codegen "app/main.hs")
     writeFile' "devel.hs" $(codegen "devel.hs")
     writeFile' (project ++ ".cabal") $(codegen "project.cabal")
 

yesod/scaffold/project.cabal.cg

@@ -81,8 +81,8 @@ executable         ~project~
     if flag(library-only)
         Buildable: False
 
-    main-is:           ../main.hs
-    hs-source-dirs:    dist
+    main-is:           main.hs
+    hs-source-dirs:    app
     build-depends:     base
                      , ~project~
                      , yesod-default

yesod/test/scaffold.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -ex
 
-runghc main.hs init
+runghc -i. -idist/build/autogen main.hs init
 
 (
   cd foobar

yesod/yesod.cabal

@@ -23,7 +23,7 @@ extra-source-files:
   scaffold/LICENSE.cg
   scaffold/project.cabal.cg
   scaffold/mongoDBConnPool.cg
-  scaffold/main.hs.cg
+  scaffold/app/main.hs.cg
   scaffold/postgresqlConnPool.cg
   scaffold/Foundation.hs.cg
   scaffold/sqliteConnPool.cg
@@ -45,7 +45,6 @@ extra-source-files:
   scaffold/templates/homepage.julius.cg
   scaffold/templates/default-layout-wrapper.hamlet.cg
   scaffold/deploy/Procfile.cg
-  scaffold/main.hs.cg
   scaffold/devel.hs.cg
   scaffold/Handler/Home.hs.cg
   scaffold/templates/normalize.lucius.cg