From 8a98b83286aeccfcd275d257c9dd8fd8e1003705 Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Sat, 28 Nov 2009 15:37:56 +0000
Subject: [PATCH] web: rename -fhapps flag to -fweb

---
 Commands/All.hs | 4 ++--
 MANUAL          | 4 ++--
 Makefile        | 8 ++++----
 Options.hs      | 2 +-
 Version.hs      | 4 ++--
 hledger.cabal   | 6 +++---
 hledger.hs      | 2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Commands/All.hs b/Commands/All.hs
index 7d3f3cbaf..106c3f958 100644
--- a/Commands/All.hs
+++ b/Commands/All.hs
@@ -18,7 +18,7 @@ module Commands.All (
 #ifdef VTY
                      module Commands.UI,
 #endif
-#ifdef HAPPS
+#ifdef WEB
                      module Commands.Web,
 #endif
               )
@@ -33,6 +33,6 @@ import Commands.Stats
 #ifdef VTY
 import Commands.UI
 #endif
-#ifdef HAPPS
+#ifdef WEB
 import Commands.Web
 #endif
diff --git a/MANUAL b/MANUAL
index 5754503cc..5115a5001 100644
--- a/MANUAL
+++ b/MANUAL
@@ -46,7 +46,7 @@ hledger works on all major platforms. One of these pre-built binaries_ might wor
 If not, please report the problem, then install the `Haskell Platform`_ and type::
 
  cabal update
- cabal install hledger [-fvty] [-fhapps]
+ cabal install hledger [-fvty] [-fweb]
 
 The optional -f flags will install more libraries and enable hledger's
 "ui" and "web" commands respectively. Note -fvty may not work on Microsoft
@@ -76,7 +76,7 @@ account name or transaction description.  Here are some commands to try
  hledger reg desc:shop                 # transactions with shop in the description
  hledger histogram                     # transactions per day, or other interval
  hledger ui                            # curses ui, if installed with -fvty
- hledger web                           # web ui, if installed with -fhapps
+ hledger web                           # web ui, if installed with -fweb
  hledger -f new.ledger add             # record transactions from the command line
 
 Reference
diff --git a/Makefile b/Makefile
index efe0055cd..88c908656 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # hledger project makefile
 
 # optional features described in MANUAL, comment out if you don't have the libs
-OPTFLAGS=-DHAPPS -DVTY
+OPTFLAGS=-DWEB -DVTY
 
 # command to run during "make ci"
 CICMD=test
@@ -37,7 +37,7 @@ default: tag hledger
 
 # build the standard cabal binary
 hledgercabal:
-	cabal configure -fhapps -fvty && cabal build
+	cabal configure -fweb -fvty && cabal build
 
 # build the standard developer's binary, quickly
 hledger: setversion
@@ -160,14 +160,14 @@ warningstest:
 quickcabaltest: setversion
 	@(cabal clean \
 		&& cabal check \
-		&& cabal configure -fvty -fhapps \
+		&& cabal configure -fvty -fweb \
 		&& echo $@ passed) || echo $@ FAILED
 
 # make sure cabal is happy in all possible ways
 fullcabaltest: setversion
 	@(cabal clean \
 		&& cabal check \
-		&& cabal configure -fvty -fhapps \
+		&& cabal configure -fvty -fweb \
 		&& cabal build \
 		&& dist/build/hledger/hledger test 2>&1 | tail -1 | grep -q 'Errors: 0  Failures: 0' \
 		&& cabal sdist \
diff --git a/Options.hs b/Options.hs
index 9bfe376ca..18665dbd1 100644
--- a/Options.hs
+++ b/Options.hs
@@ -36,7 +36,7 @@ usagehdr =
 #ifdef VTY
   "  ui        - run a simple text-based UI\n" ++
 #endif
-#ifdef HAPPS
+#ifdef WEB
   "  web       - run a simple web-based UI\n" ++
 #endif
   "  test      - run self-tests\n" ++
diff --git a/Version.hs b/Version.hs
index 75ccc60b4..75d0b3db0 100644
--- a/Version.hs
+++ b/Version.hs
@@ -64,7 +64,7 @@ configflags   = tail [""
 #ifdef VTY
   ,"vty"
 #endif
-#ifdef HAPPS
-  ,"happs"
+#ifdef WEB
+  ,"web"
 #endif
  ]
diff --git a/hledger.cabal b/hledger.cabal
index e9ab8352b..cbfa7a1a7 100644
--- a/hledger.cabal
+++ b/hledger.cabal
@@ -33,7 +33,7 @@ flag vty
   description: enable the curses ui
   default:     False
 
-flag happs
+flag web
   description: enable the web ui
   default:     False
 
@@ -126,8 +126,8 @@ executable hledger
     build-depends:
                   vty >= 4.0.0.1 && < 4.1
 
-  if flag(happs)
-    cpp-options: -DHAPPS
+  if flag(web)
+    cpp-options: -DWEB
     other-modules:Commands.Web
     build-depends:
                   hsp
diff --git a/hledger.hs b/hledger.hs
index f08710edb..2aeb4c05c 100644
--- a/hledger.hs
+++ b/hledger.hs
@@ -65,7 +65,7 @@ main = do
 #ifdef VTY
        | cmd `isPrefixOf` "ui"        = withLedgerDo opts args cmd ui
 #endif
-#ifdef HAPPS
+#ifdef WEB
        | cmd `isPrefixOf` "web"       = withLedgerDo opts args cmd web
 #endif
        | cmd `isPrefixOf` "test"      = runtests opts args >> return ()