diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2021-11-11 05:15:23 +0000 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-11-12 21:26:50 -0500 |
| commit | 0b1da2f1e911e941310a20ed7650670d624f6ebe (patch) | |
| tree | 81c90f0aac06c63907994c87d56ca0aad42b351d | |
| parent | bba156f3581913a52cefbcbcb8031f274aaa189a (diff) | |
| download | haskell-0b1da2f1e911e941310a20ed7650670d624f6ebe.tar.gz | |
Make: Install RTS headers in `$libdir/rts/include` not `$libdir/include`
Before we were violating the convention of every other package. This
fixes that. It matches the changes made in
d5de970dafd5876ef30601697576167f56b9c132 to the location of the files in
the repo.
| -rw-r--r-- | mk/install.mk.in | 2 | ||||
| -rw-r--r-- | rts/package.conf.in | 2 | ||||
| -rw-r--r-- | rules/manual-package-config.mk | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/mk/install.mk.in b/mk/install.mk.in index 0856805285..7b146e7bed 100644 --- a/mk/install.mk.in +++ b/mk/install.mk.in @@ -103,7 +103,7 @@ endif ghclibexecdir = $(ghclibdir) topdir = $(ghclibdir) -ghcheaderdir = $(ghclibdir)/include +ghcheaderdir = $(ghclibdir)/rts/include #----------------------------------------------------------------------------- # install configuration diff --git a/rts/package.conf.in b/rts/package.conf.in index 69ee9ba54d..46103e49b9 100644 --- a/rts/package.conf.in +++ b/rts/package.conf.in @@ -18,7 +18,7 @@ hidden-modules: import-dirs: #if defined(INSTALLING) -library-dirs: LIB_DIR"/rts" FFI_LIB_DIR LIBDW_LIB_DIR +library-dirs: LIB_DIR FFI_LIB_DIR LIBDW_LIB_DIR #else /* !INSTALLING */ library-dirs: TOP"/rts/dist-install/build" FFI_LIB_DIR LIBDW_LIB_DIR #endif diff --git a/rules/manual-package-config.mk b/rules/manual-package-config.mk index 3905c437ac..72c3a369b6 100644 --- a/rules/manual-package-config.mk +++ b/rules/manual-package-config.mk @@ -37,8 +37,8 @@ $1/$2/package.conf.inplace : $1/package.conf.in $$$$(ghc-pkg_INPLACE) | $$$$(dir $1/$2/package.conf.install : $1/package.conf.in | $$$$(dir $$$$@)/. $$(HS_CPP) -P \ -DINSTALLING \ - -DLIB_DIR='"$$(if $$(filter YES,$$(RelocatableBuild)),$$$$topdir,$$(ghclibdir))"' \ - -DINCLUDE_DIR='"$$(if $$(filter YES,$$(RelocatableBuild)),$$$$topdir,$$(ghclibdir))/include"' \ + -DLIB_DIR='"$$(if $$(filter YES,$$(RelocatableBuild)),$$$$topdir,$$(ghclibdir))/$1"' \ + -DINCLUDE_DIR='"$$(if $$(filter YES,$$(RelocatableBuild)),$$$$topdir,$$(ghclibdir))/$1/include"' \ $$($1_PACKAGE_CPP_OPTS) \ $$(addprefix -I,$$(GHC_INCLUDE_DIRS)) \ -I$$(BUILD_$3_INCLUDE_DIR) \ |