X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=utils%2Fghc-pkg%2FMakefile;h=0783d3f1b21cd2d63b061d3964baeb39b16aa02d;hb=e4f46f5de1749a06a927d98f0195e208f5eff374;hp=6fba1c814bbd25f458fa65a7a0376751fd71f11a;hpb=eed437cdefb952e6c70e58012b23d436e74710af;p=ghc-hetmet.git

diff --git a/utils/ghc-pkg/Makefile b/utils/ghc-pkg/Makefile
index 6fba1c8..0783d3f 100644
--- a/utils/ghc-pkg/Makefile
+++ b/utils/ghc-pkg/Makefile
@@ -1,54 +1,15 @@
 
 TOP=../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/cabal-flags.mk
-
-SRC_HC_OPTS += -Wall
-
-# XXX From old Makefile:
-# SRC_HC_OPTS += -cpp -Wall -fno-warn-name-shadowing -fno-warn-unused-matches
+ENABLE_SHELL_WRAPPERS = YES
+EXTRA_CLEAN = Version.hs
+EXTRA_INPLACE_CONFIGURE_FLAGS = $(INPLACE_GHC_DATADIR_CONFIGURE_FLAGS)
+EXTRA_STAGE1_CONFIGURE_FLAGS = --datasubdir=.
 
-ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
-INSTALL_FLAGS =
-else
-INSTALL_FLAGS = --enable-shell-wrappers
-endif
-
-default all: with-bootstrapping-compiler
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/cabal.mk
 
 with-bootstrapping-compiler: Version.hs
-	$(CABAL) configure --distpref dist-inplace         \
-	                   $(INPLACE_DIRS_CONFIGURE_FLAGS) \
-	                   $(USE_BOOT_CONFIGURE_FLAGS)     \
-	                   $(COMMON_CONFIGURE_FLAGS)
-	$(CABAL) build     --distpref dist-inplace $(BUILD_FLAGS)
-	$(CABAL) install   --distpref dist-inplace $(INSTALL_FLAGS)
-
 with-stage-1: Version.hs
-	$(CABAL) configure --distpref dist-install         \
-	                   $(INSTALL_DIRS_CONFIGURE_FLAGS) \
-	                   $(USE_STAGE1_CONFIGURE_FLAGS)   \
-	                   $(COMMON_CONFIGURE_FLAGS)
-	$(CABAL) build     --distpref dist-install $(BUILD_FLAGS)
-
-install:
-	$(INSTALL_PACKAGE) install UNUSED UNUSED '$(DESTDIR)' '$(prefix)' \
-	                   '$(prefix)' '$(bindir)' '$(libdir)'            \
-                       '$(libexecdir)' '$(dynlibdir)' '$(datadir)'    \
-                       '$(docdir)' '$(htmldir)' '$(haddockdir)'
-	                   --distpref dist-install                        \
-	                   $(INSTALL_FLAGS)
-
-clean: distclean
-
-distclean:
-	-$(CABAL) clean --distpref dist-inplace
-	-$(CABAL) clean --distpref dist-install
-	$(RM) -f Version.hs
-
-# XXX fix binary-dist
-
-##### Here down is unique to ghc-pkg
 
 Version.hs: Makefile $(TOP)/mk/config.mk
 	$(RM) -f Version.hs