Skip to content

Commit cc502c8

Browse files
committed
Fix multi-file use of install-sh
1 parent e783b55 commit cc502c8

2 files changed

Lines changed: 18 additions & 2 deletions

File tree

ports/icu/fix-using-install-sh.diff

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
1+
diff --git a/source/Makefile.in b/source/Makefile.in
2+
index 9e15b6a016..53330a3921 100644
3+
--- a/source/Makefile.in
4+
+++ b/source/Makefile.in
5+
@@ -189,7 +189,10 @@ install-icu: $(INSTALLED_BUILT_FILES)
6+
$(INSTALL_SCRIPT) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(pkgdatadir)/mkinstalldirs
7+
$(INSTALL_SCRIPT) $(top_srcdir)/install-sh $(DESTDIR)$(pkgdatadir)/install-sh
8+
@$(MKINSTALLDIRS) $(DESTDIR)$(libdir)/pkgconfig
9+
- $(INSTALL_DATA) $(ALL_PKGCONFIG_FILES) $(DESTDIR)$(libdir)/pkgconfig/
10+
+ # icu's fallback install-sh does not support multi-file install
11+
+ @for file in $(ALL_PKGCONFIG_FILES); do \
12+
+ $(INSTALL_DATA) "$${file}" $(DESTDIR)$(libdir)/pkgconfig/ ; \
13+
+ done
14+
$(INSTALL_DATA) $(top_srcdir)/../LICENSE $(DESTDIR)$(pkgdatadir)/LICENSE
15+
ifeq ($(INSTALL_ICU_CONFIG),true)
16+
$(INSTALL_SCRIPT) $(top_builddir)/config/icu-config $(DESTDIR)$(bindir)/icu-config
117
diff --git a/source/configure b/source/configure
2-
index a6df219..2e1ebcf 100644
18+
index dfa3a091f8..8ee911d42d 100755
319
--- a/source/configure
420
+++ b/source/configure
521
@@ -4935,12 +4935,12 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'

versions/i-/icu.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"versions": [
33
{
4-
"git-tree": "da9f6dddd34300c1eea72aadde1d774ce2d3f31c",
4+
"git-tree": "50a263a104075be2c5647af8e723a18914f6ee13",
55
"version": "78.3",
66
"port-version": 2
77
},

0 commit comments

Comments
 (0)