diff options
| author | Thomas Miedema <thomasmiedema@gmail.com> | 2015-08-15 14:18:07 +0200 |
|---|---|---|
| committer | Thomas Miedema <thomasmiedema@gmail.com> | 2015-08-21 19:20:51 +0200 |
| commit | 47493e60fa2f8f520297969472dde01931530707 (patch) | |
| tree | 75695993b4d953131a1f580fa4cb362e4f1ab70a /mk | |
| parent | 2f29ebbb6f8c914f2bba624f3edcc259274df8af (diff) | |
| download | haskell-47493e60fa2f8f520297969472dde01931530707.tar.gz | |
Build system: simplify install.mk.in
This will allow fixing #1851 more easily
("make install-strip" should work).
This reverts 57e2a81c589103b50da80a9e378b1a11285bd521:
"On Cygwin, use a Cygwin-style path for /bin/install's destination"
Update submodule haddock and hsc2hs.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/install.mk.in | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/mk/install.mk.in b/mk/install.mk.in index da6680d6b6..38e6459466 100644 --- a/mk/install.mk.in +++ b/mk/install.mk.in @@ -132,21 +132,15 @@ INSTALL_GROUP = # CREATE_SCRIPT = create () { touch "$$1" && chmod 755 "$$1" ; } && create CREATE_DATA = create () { touch "$$1" && chmod 644 "$$1" ; } && create -# These takes 3 arguments: -# $1 = flags -# $2 = files -# $3 = dest -INSTALL_PROGRAM = $(INSTALL) -m 755 $1 $2 $(call MK_INSTALL_DEST,$3) -INSTALL_SCRIPT = $(INSTALL) -m 755 $1 $2 $(call MK_INSTALL_DEST,$3) -INSTALL_SHLIB = $(INSTALL) -m 755 $1 $2 $(call MK_INSTALL_DEST,$3) -INSTALL_DATA = $(INSTALL) -m 644 $1 $2 $(call MK_INSTALL_DEST,$3) -INSTALL_HEADER = $(INSTALL) -m 644 $1 $2 $(call MK_INSTALL_DEST,$3) -INSTALL_MAN = $(INSTALL) -m 644 $1 $2 $(call MK_INSTALL_DEST,$3) -INSTALL_DOC = $(INSTALL) -m 644 $1 $2 $(call MK_INSTALL_DEST,$3) -# Only 1 argument, the directory to create: -INSTALL_DIR = $(INSTALL) -m 755 -d $(call MK_INSTALL_DEST,$1) - -MK_INSTALL_DEST = $1 + +INSTALL_PROGRAM = $(INSTALL) -m 755 +INSTALL_SCRIPT = $(INSTALL) -m 755 +INSTALL_SHLIB = $(INSTALL) -m 755 +INSTALL_DATA = $(INSTALL) -m 644 +INSTALL_HEADER = $(INSTALL) -m 644 +INSTALL_MAN = $(INSTALL) -m 644 +INSTALL_DOC = $(INSTALL) -m 644 +INSTALL_DIR = $(INSTALL) -m 755 -d # runhaskell and hsc2hs are special, in that other compilers besides # GHC might provide them. Systems with a package manager often come |