diff options
| author | Ian Lynagh <igloo@earth.li> | 2009-08-14 22:45:49 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2009-08-14 22:45:49 +0000 |
| commit | 926ae90b75cd3368049854898062a563e57c9ad2 (patch) | |
| tree | 543ef37498be98d3cb18a587c26b589e8d78d311 /distrib | |
| parent | 328681951873b54dade3d0ecef2bea9bf97fff29 (diff) | |
| download | haskell-926ae90b75cd3368049854898062a563e57c9ad2.tar.gz | |
Make our install variables etc compliant with GNU standards; fixes #1924
Diffstat (limited to 'distrib')
| -rw-r--r-- | distrib/Makefile-bin-vars.in | 53 | ||||
| -rw-r--r-- | distrib/configure-bin.ac | 2 |
2 files changed, 1 insertions, 54 deletions
diff --git a/distrib/Makefile-bin-vars.in b/distrib/Makefile-bin-vars.in index d213498835..08993693e1 100644 --- a/distrib/Makefile-bin-vars.in +++ b/distrib/Makefile-bin-vars.in @@ -7,30 +7,7 @@ FPTOOLS_TOP_ABS = @hardtop@ # rather than ghc-pkg.exe. GHC_PKG_PROG = $(FPTOOLS_TOP_ABS)/utils/ghc-pkg/ghc-pkg.bin -# Where the different pieces of the bundle should go: -bindir = @bindir@ -libdir = @libdir@/$(package)-$(version) -libexecdir = $(libdir) -datarootdir = @datarootdir@ -# datadir is set to libdir here as GHC needs package.conf and unlit -# to be in the same place (and things like ghc-pkg need to agree on -# where package.conf is, so we just set it globally). -datadir = $(libdir) - platform = @TargetPlatform@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -mandir = $(datarootdir)/man - -headerdir = $(libdir)/include - -# default -docdir = @datadir@/doc/ghc -htmldir = $(docdir) -psdir = $(docdir) -pdfdir = $(docdir) - PERL = @PerlCmd@ SH = /bin/sh @@ -56,36 +33,6 @@ CPP = @CPP@ RAWCPP_FLAGS = -undef -traditional -#----------end of user-serviceable parts------------ -# -# -# How to install the different pieces -# -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) -INSTALL_HEADER = $(INSTALL) $(INSTALL_HEADER_OPTS) -INSTALL_SHLIB = $(INSTALL) $(INSTALL_SHLIB_OPTS) -INSTALL_MAN = $(INSTALL) $(INSTALL_MAN_OPTS) - -# What's common to all installs -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_PROGRAM_OPTS = -m $(BIN_PERMS) $(INSTALL_OPTS) $(EXTRA_INSTALL_PROGRAM_OPTS) -INSTALL_HEADER_OPTS = -m $(LIB_PERMS) $(INSTALL_OPTS) $(EXTRA_INSTALL_HEADER_OPTS) -INSTALL_SHLIB_OPTS = -m $(BIN_PERMS) $(INSTALL_OPTS) $(EXTRA_INSTALL_SHLIB_OPTS) -INSTALL_MAN_OPTS = -m $(LIB_PERMS) $(INSTALL_OPTS) $(EXTRA_INSTALL_MAN_OPTS) - EXECUTABLE_FILE = chmod $(BIN_PERMS) GHC_COMPAT_DIR=$(TOP)/mk diff --git a/distrib/configure-bin.ac b/distrib/configure-bin.ac index 783c1f1680..49f995c601 100644 --- a/distrib/configure-bin.ac +++ b/distrib/configure-bin.ac @@ -167,7 +167,7 @@ dnl ** Check gcc version and flags we need to pass it ** FP_GCC_EXTRA_FLAGS # -AC_CONFIG_FILES(extra-gcc-opts mk/config.mk) +AC_CONFIG_FILES(extra-gcc-opts mk/config.mk mk/install.mk) AC_OUTPUT echo "****************************************************" |