Skip to content
Snippets Groups Projects
Commit 0b1da2f1 authored by John Ericson's avatar John Ericson Committed by Marge Bot
Browse files

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
d5de970d to the location of the files in
the repo.
parent bba156f3
No related branches found
No related tags found
No related merge requests found
......@@ -103,7 +103,7 @@ endif
ghclibexecdir = $(ghclibdir)
topdir = $(ghclibdir)
ghcheaderdir = $(ghclibdir)/include
ghcheaderdir = $(ghclibdir)/rts/include
#-----------------------------------------------------------------------------
# install configuration
......
......@@ -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
......
......@@ -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) \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment