From 30219e9af59ffe57a2fd3e7249239ea577aea2b1 Mon Sep 17 00:00:00 2001 From: Ilias Tsitsimpis Date: Wed, 13 Dec 2023 12:28:47 +0200 Subject: [PATCH] Use realpath instead of custom script Use realpath instead of the custom script, which is broken. As an example, $ ./mk/relpath.sh /usr/lib/ghc/lib /usr/lib/ghc-doc ..-doc $ realpath --relative-to=/usr/lib/ghc/lib /usr/lib/ghc-doc ../../ghc-doc Gbp-Pq: Name hadrian-relpath --- hadrian/bindist/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadrian/bindist/Makefile b/hadrian/bindist/Makefile index eb5333c1..acbb94e0 100644 --- a/hadrian/bindist/Makefile +++ b/hadrian/bindist/Makefile @@ -229,7 +229,7 @@ update_package_db: install_bin install_lib $(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'))) + $(call patchpackageconf,$(shell echo $(notdir $p) | sed 's/-\([0-9]*[0-9]\.\)*conf//g'),$(shell echo "$p" | sed 's:\0xxx\0: :g'),$(docdir),$(shell realpath -z --relative-to="$(ActualLibsDir)" "$(docdir)"),$(shell echo $(notdir $p) | sed 's/.conf//g'))) '$(DESTDIR)$(ActualBinsDir)/$(CrossCompilePrefix)ghc-pkg' --global-package-db "$(DESTDIR)$(ActualLibsDir)/package.conf.d" recache install_mingw: -- 2.30.2