diff options
| author | Ian Lynagh <igloo@earth.li> | 2007-09-05 16:06:41 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2007-09-05 16:06:41 +0000 |
| commit | cafb1e0f6bb93fb720e3bb3432c777cd9736bf80 (patch) | |
| tree | 40b90c1977d9c5d7f8ab4a269b6ac11f96946d03 /mk | |
| parent | 25f84fa7e4b84c3db5ba745a7881c009b778e0b1 (diff) | |
| download | haskell-cafb1e0f6bb93fb720e3bb3432c777cd9736bf80.tar.gz | |
Fix up bindist creation and publishing
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/config.mk.in | 15 | ||||
| -rw-r--r-- | mk/package.mk | 2 |
2 files changed, 13 insertions, 4 deletions
diff --git a/mk/config.mk.in b/mk/config.mk.in index c716ab0556..417d6e4583 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -506,9 +506,13 @@ FPTOOLS_TOP_ABS_PLATFORM = @hardtop_plat@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ BIN_DIST_NAME=ghc-$(ProjectVersion) -BIN_DIST_TOPDIR=$(FPTOOLS_TOP_ABS) -BIN_DIST_DIR=$(BIN_DIST_TOPDIR)/$(BIN_DIST_NAME) -BIN_DIST_TARBALL=$(BIN_DIST_TOPDIR)/$(BIN_DIST_NAME)-$(TARGETPLATFORM).tar.bz2 +BIN_DIST_TOPDIR_REL=$(FPTOOLS_TOP) +BIN_DIST_TOPDIR_ABS=$(FPTOOLS_TOP_ABS) +BIN_DIST_DIR=$(BIN_DIST_TOPDIR_ABS)/$(BIN_DIST_NAME) +BIN_DIST_TARBALL=$(BIN_DIST_TOPDIR_REL)/$(BIN_DIST_NAME)-$(TARGETPLATFORM).tar.bz2 + +BIN_DIST_INST_DIR = $(FPTOOLS_TOP_ABS)/bindisttest/installed + # # Installation directories, we don't use half of these, @@ -614,6 +618,11 @@ ifeq "$(strip $(mandir))" "" mandir = $(prefix)/man endif +# This is a bit of a lie, as this is a wrapper rather than the program +# itself. However, it means that we don't have to worry about Windows +# and non-Windows having different extensions. +GHC_PKG_PROG = $(FPTOOLS_TOP_ABS)/$(GHC_PKG_DIR_REL)/ghc-pkg-inplace + #----------------------------------------------------------------------------- # install configuration diff --git a/mk/package.mk b/mk/package.mk index 60507dbde3..78c01f285e 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -84,7 +84,7 @@ install:: -x c $(PACKAGE_CPP_OPTS) package.conf.in \ | grep -v '^#pragma GCC' \ | sed -e 's/""//g' -e 's/:[ ]*,/: /g' \ - | $(FPTOOLS_TOP_ABS)/$(GHC_PKG_DIR_REL)/ghc-pkg-inplace --global-conf $(DESTDIR)$(libdir)/package.conf update - --force + | $(GHC_PKG_PROG) --global-conf $(DESTDIR)$(libdir)/package.conf update - --force # we could be more accurate here and add a dependency on # driver/package.conf, but that doesn't work too well because of |