summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2022-08-05 21:23:21 -0400
committerBen Gamari <ben@smart-cactus.org>2022-08-06 16:32:09 -0400
commitcc71593529ceeed5ecc38de645db331acb37a771 (patch)
tree16fd35c1cef21fc7e137b8c7358a9257c952e6a0
parent669fd338c0887d5124428d826f9d9748f6a85959 (diff)
downloadhaskell-cc71593529ceeed5ecc38de645db331acb37a771.tar.gz
hadrian: Fix installation of system-cxx-std-lib package conf
(cherry picked from commit 119ee22dd09d8977de67939de7324af941ae7196)
-rw-r--r--hadrian/bindist/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/hadrian/bindist/Makefile b/hadrian/bindist/Makefile
index 36e09830e5..05f6b68698 100644
--- a/hadrian/bindist/Makefile
+++ b/hadrian/bindist/Makefile
@@ -234,7 +234,7 @@ install_wrappers: install_bin_libdir
PKG_CONFS = $(shell find "$(DESTDIR)$(ActualLibsDir)/package.conf.d" -name '*.conf' | sed "s: :\0xxx\0:g")
update_package_db: install_bin install_lib
@echo "Installing C++ standard library virtual package"
- $(INSTALL_DATA) mk/system-cxx-std-lib-1.0.conf "$(DESTDIR)$(ActualLibsDir)/"
+ $(INSTALL_DATA) mk/system-cxx-std-lib-1.0.conf "$(DESTDIR)$(ActualLibsDir)/package.conf.d"
@echo "Updating the package DB"
$(foreach p, $(PKG_CONFS),\
$(call patchpackageconf,$(shell echo $(notdir $p) | sed 's/-\([0-9]*[0-9]\.\)*conf//g'),$(shell echo "$p" | sed 's:\0xxx\0: :g'),$(docdir),$(shell mk/relpath.sh "$(ActualLibsDir)" "$(docdir)"),$(shell echo $(notdir $p) | sed 's/.conf//g')))