diff options
| author | sven.panne@aedion.de <unknown> | 2007-09-08 13:18:09 +0000 |
|---|---|---|
| committer | sven.panne@aedion.de <unknown> | 2007-09-08 13:18:09 +0000 |
| commit | 01c80d847da9379e5abc01a91c44d423c3df4efe (patch) | |
| tree | 1a1548183447d56ccda5d26e505d52018e6315bc /mk | |
| parent | 62bad18960643f862bba8f14c31cce15b287fb81 (diff) | |
| download | haskell-01c80d847da9379e5abc01a91c44d423c3df4efe.tar.gz | |
Removed setting of default values for variables which are never empty
The standard autoconf variables like prefix, exec_prefix, ... are always set by
configure, so there is no need to provide explicit defaults in the Makefile.
The lines were introduced about a decade ago, perhaps there were some bugs in
ancient autoconfs, but today I can't think of a reason why this should be still
necessary.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/config.mk.in | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/mk/config.mk.in b/mk/config.mk.in index e0b9d3cec9..383011d711 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -557,10 +557,6 @@ mandir := @mandir@ ifeq "$(Windows)" "YES" -ifeq "$(strip $(prefix))" "" -prefix = /c/ghc -endif - # Hack: our directory layouts tend to be different on Windows, so # hack around configure's bogus assumptions here. datarootdir := $(prefix) @@ -569,10 +565,8 @@ libdir := $(prefix) else -# # Unix: override libdir and datadir to put ghc-specific stuff in # a subdirectory with the version number included. -# datarootdir := $(datadir0) datadir := $(datadir0)/ghc-$(ProjectVersion) libdir := $(libdir0)/ghc-$(ProjectVersion) @@ -600,40 +594,12 @@ psdir := $(docdir) # (overriden for packages in package.mk) ifacedir = $(libdir) -# -# Default values for most of the above are only set if -# they weren't configured to anything in particular -# via the configure script. (i.e., we make no assumption -# that the autoconf-generated script will assign defaults -# to all of the above). -# -ifeq "$(strip $(exec_prefix))" "" -exec_prefix = $(prefix) -endif -ifeq "$(strip $(bindir))" "" -bindir = $(exec_prefix)/bin -endif - -# # NOTE: by intention, libexecdir and libdir point to # the same place. # => Only way to override this is to set libexecdir= on the command line. # (NOTE: configure script setting is ignored). libexecdir = $(libdir) -ifeq "$(strip $(datadir))" "" -datadir = $(prefix)/share -endif -ifeq "$(strip $(libdir))" "" -libdir = $(exec_prefix)/lib -endif -ifeq "$(strip $(includedir))" "" -includedir = $(prefix)/include -endif -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. |