Use Cabal to build pwd

diff --git a/utils/pwd/Makefile b/utils/pwd/Makefile
index 0935a64..53a62f0 100644 (file)
--- a/utils/pwd/Makefile
+++ b/utils/pwd/Makefile
@@ -1,26 +1,6 @@
 TOP=../..
-include $(TOP)/mk/boilerplate.mk
-
-# Beyond stage 1, honour any Mac OS X depolyment target options.  If we use 
-# these options in stage 1 we get a linker error if the bootstrap compiler is
-#  for a more recent OS version
-ifeq "$(stage)" "2"
-SRC_CC_OPTS += $(MACOSX_DEPLOYMENT_CC_OPTS)
-SRC_HC_OPTS += $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS))
-SRC_LD_OPTS += $(addprefix -optl, $(MACOSX_DEPLOYMENT_LD_OPTS))
-endif
+EXTRA_CLEAN = pwd pwd.exe
 
-# We have two version: the inplace version compiled by the bootstrap compiler
-#   and the install version compiled by the stage 1 compiler
-ifeq "$(stage)" "2"
-HS_PROG           = pwd
-else
-HS_PROG           = pwd-inplace
-endif
-
-binary-dist:
-       $(INSTALL_DIR)                      $(BIN_DIST_DIR)/utils/pwd
-       $(INSTALL_DATA)    Makefile         $(BIN_DIST_DIR)/utils/pwd/
-       $(INSTALL_PROGRAM) pwd$(exeext)     $(BIN_DIST_DIR)/utils/pwd/
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/cabal.mk
 
-include $(TOP)/mk/target.mk

diff --git a/utils/pwd/Setup.hs b/utils/pwd/Setup.hs
new file mode 100644 (file)
index 0000000..9a994af
--- /dev/null
+++ b/utils/pwd/Setup.hs
@@ -0,0 +1,2 @@
+import Distribution.Simple
+main = defaultMain

diff --git a/utils/pwd/pwd.cabal b/utils/pwd/pwd.cabal
new file mode 100644 (file)
index 0000000..5422a73
--- /dev/null
+++ b/utils/pwd/pwd.cabal
@@ -0,0 +1,24 @@
+Name: pwd
+Version: 0.1
+Copyright: XXX
+License: BSD
+-- XXX License-File: LICENSE
+-- XXX Author:
+-- XXX Maintainer:
+Synopsis: XXX
+Description:
+       XXX
+build-type: Simple
+cabal-version: >=1.2
+
+Flag base3
+  Description: Choose the new smaller, split-up base package.
+
+Executable pwd
+    Main-Is: pwd.hs
+    if flag(base3)
+        Build-Depends: base       >= 3   && < 4,
+                       directory  >= 1   && < 1.1
+    else
+        Build-Depends: base < 3
+