From 47365910daec25de7bb439651fb6fadbf0674443 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Fri, 12 Oct 2012 11:04:58 +0200
Subject: [PATCH] Put main.hs in app, no dist hardcoding

---
 yesod/Scaffolding/Scaffolder.hs     | 5 +++--
 yesod/scaffold/{ => app}/main.hs.cg | 0
 yesod/scaffold/project.cabal.cg     | 4 ++--
 yesod/test/scaffold.sh              | 2 +-
 yesod/yesod.cabal                   | 3 +--
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename yesod/scaffold/{ => app}/main.hs.cg (100%)

diff --git a/yesod/Scaffolding/Scaffolder.hs b/yesod/Scaffolding/Scaffolder.hs
index c88c8018..9018da3b 100644
--- a/yesod/Scaffolding/Scaffolder.hs
+++ b/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")
 
diff --git a/yesod/scaffold/main.hs.cg b/yesod/scaffold/app/main.hs.cg
similarity index 100%
rename from yesod/scaffold/main.hs.cg
rename to yesod/scaffold/app/main.hs.cg
diff --git a/yesod/scaffold/project.cabal.cg b/yesod/scaffold/project.cabal.cg
index a165d51b..039c3719 100644
--- a/yesod/scaffold/project.cabal.cg
+++ b/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
diff --git a/yesod/test/scaffold.sh b/yesod/test/scaffold.sh
index 1665a382..92210188 100755
--- a/yesod/test/scaffold.sh
+++ b/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
diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal
index b7a3cbe3..d8689e69 100644
--- a/yesod/yesod.cabal
+++ b/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