diff options
| author | Ian Lynagh <igloo@earth.li> | 2007-06-01 19:06:59 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2007-06-01 19:06:59 +0000 |
| commit | 79b5a2cb4b9ed5fe41a05fa2ec98bd1f83971daf (patch) | |
| tree | 0c416a30476cbc2ebeaa8b3ada902587f123f0e5 /distrib/Makefile-bin-vars.in | |
| parent | 430453c5131592b6147a80202dc5f7fbe3f3d5fd (diff) | |
| download | haskell-79b5a2cb4b9ed5fe41a05fa2ec98bd1f83971daf.tar.gz | |
Fix bindist creation
Bindists should now work again, when doing "make install" at least.
"make in-place" is probably still broken.
Diffstat (limited to 'distrib/Makefile-bin-vars.in')
| -rw-r--r-- | distrib/Makefile-bin-vars.in | 40 |
1 files changed, 19 insertions, 21 deletions
diff --git a/distrib/Makefile-bin-vars.in b/distrib/Makefile-bin-vars.in index 53c4163606..0a4fdb98d1 100644 --- a/distrib/Makefile-bin-vars.in +++ b/distrib/Makefile-bin-vars.in @@ -1,7 +1,11 @@ +# Where we are +bindist_abs_root = @hardtop@ + # Where the different pieces of the bundle should go: bindir = @bindir@ libdir = @libdir@/$(package)-$(version) +libexecdir = $(libdir) datadir = @datadir@/$(package)-$(version) platform = @TargetPlatform@ @@ -26,28 +30,17 @@ exeext = @exeext@ SED = @SedCmd@ DEFAULT_TMPDIR = /tmp -# sigh -INSTALL_DIR = ./mkdirhier - -# -# Set of package scripts for which you'd like a name-<version> symlink -# to be created, i.e., create a symlink, ghc-$(version), pointing to ghc to -# avoid version vertigo. -# -VERSION_SYMLINKS_FOR=$(PACKAGE_LINKS) - -# Binaries to install -PACKAGE_BIN_INSTALL=$(PACKAGE_PRL_SCRIPTS) $(PACKAGE_SH_SCRIPTS) - #----------end of user-serviceable parts------------ # # # How to install the different pieces # -INSTALL_BIN = $(INSTALL) $(INSTALL_BIN_OPTS) -INSTALL_LIB = $(INSTALL) $(INSTALL_LIB_OPTS) -INSTALL_DATA = $(INSTALL) $(INSTALL_DATA_OPTS) -INSTALL_SCRIPT = $(INSTALL) $(INSTALL_SCRIPT_OPTS) +INSTALL_DIR = $(bindist_abs_root)/utils/mkdirhier/mkdirhier +INSTALL_BIN = $(INSTALL) $(INSTALL_BIN_OPTS) +INSTALL_LIB = $(INSTALL) $(INSTALL_LIB_OPTS) +INSTALL_DATA = $(INSTALL) $(INSTALL_DATA_OPTS) +INSTALL_SCRIPT = $(INSTALL) $(INSTALL_SCRIPT_OPTS) +INSTALL_PROGRAM = $(INSTALL) $(INSTALL_PROGRAM_OPTS) # What's common to all installs INSTALL_OPTS= $(EXTRA_INSTALL_OPTS) @@ -55,8 +48,13 @@ INSTALL_OPTS= $(EXTRA_INSTALL_OPTS) BIN_PERMS = 755 LIB_PERMS = 644 -INSTALL_BIN_OPTS = -m $(BIN_PERMS) $(INSTALL_OPTS) $(EXTRA_INSTALL_BIN_OPTS) -INSTALL_LIB_OPTS = -m $(LIB_PERMS) $(INSTALL_OPTS) $(EXTRA_INSTALL_LIB_OPTS) -INSTALL_DATA_OPTS = -m $(LIB_PERMS) $(INSTALL_OPTS) $(EXTRA_INSTALL_DATA_OPTS) -INSTALL_SCRIPT_OPTS = -m $(BIN_PERMS) $(INSTALL_OPTS) $(EXTRA_INSTALL_SCRIPT_OPTS) +INSTALL_BIN_OPTS = -m $(BIN_PERMS) $(INSTALL_OPTS) $(EXTRA_INSTALL_BIN_OPTS) +INSTALL_LIB_OPTS = -m $(LIB_PERMS) $(INSTALL_OPTS) $(EXTRA_INSTALL_LIB_OPTS) +INSTALL_DATA_OPTS = -m $(LIB_PERMS) $(INSTALL_OPTS) $(EXTRA_INSTALL_DATA_OPTS) +INSTALL_SCRIPT_OPTS = -m $(BIN_PERMS) $(INSTALL_OPTS) $(EXTRA_INSTALL_SCRIPT_OPTS) +INSTALL_PROGRAM_OPTS = -m $(BIN_PERMS) $(INSTALL_OPTS) $(EXTRA_INSTALL_PROGRAM_OPTS) + +EXECUTABLE_FILE = chmod $(BIN_PERMS) + +GHC_COMPAT_DIR=$(TOP)/mk |