From 7020c7cf44200ceffd3f2cbb393c51e1fa583e62 Mon Sep 17 00:00:00 2001
From: Hugo Herbelin
Date: Wed, 25 Nov 2020 17:07:49 +0100
Subject: MacOS X install: accepting both dylib and so extensions for gtk
 immodules.

This was changed from so to dylib in dd7c679cf6, but it seems to
depend on versions of gtk. Accepting both seems ok, assuming that at
least one will work.
---
 Makefile.ide | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'Makefile.ide')

diff --git a/Makefile.ide b/Makefile.ide
index 789acee5ec..9964a474f8 100644
--- a/Makefile.ide
+++ b/Makefile.ide
@@ -262,7 +262,7 @@ $(COQIDEAPP)/Contents/Resources/loaders: $(COQIDEAPP)/Contents
 
 $(COQIDEAPP)/Contents/Resources/immodules: $(COQIDEAPP)/Contents
 	$(MKDIR) $@
-	$(INSTALLLIB) "$(GTKLIBS)/gtk-3.0/3.0.0/immodules/"*.dylib $@
+	$(INSTALLLIB) "$(GTKLIBS)/gtk-3.0/3.0.0/immodules/"*.dylib $@ || $(INSTALLLIB) "$(GTKLIBS)/gtk-3.0/3.0.0/immodules/"*.so $@
 
 
 $(COQIDEAPP)/Contents/Resources/etc: $(COQIDEAPP)/Contents/Resources/lib
@@ -271,8 +271,9 @@ $(COQIDEAPP)/Contents/Resources/etc: $(COQIDEAPP)/Contents/Resources/lib
 	{ "$(PIXBUFBIN)/gdk-pixbuf-query-loaders" $@/../loaders/*.so |\
 	 sed -e "s!/.*\(/loaders/.*.so\)!@executable_path/../Resources/\1!"; } \
 	> $@/gtk-3.0/gdk-pixbuf.loaders
-	{ "$(GTKBIN)/gtk-query-immodules-3.0" $@/../immodules/*.dylib |\
+	{ "$(GTKBIN)/gtk-query-immodules-3.0" $@/../immodules/*.{dylib,so} |\
 	 sed -e "s!/.*\(/immodules/.*.dylib\)!@executable_path/../Resources/\1!" |\
+	 sed -e "s!/.*\(/immodules/.*.so\)!@executable_path/../Resources/\1!" |\
 	 sed -e "s!/.*\(/share/locale\)!@executable_path/../Resources/\1!"; } \
 	> $@/gtk-3.0/gtk-immodules.loaders
 	$(MKDIR) $@/pango
@@ -281,7 +282,7 @@ $(COQIDEAPP)/Contents/Resources/etc: $(COQIDEAPP)/Contents/Resources/lib
 $(COQIDEAPP)/Contents/Resources/lib: $(COQIDEAPP)/Contents/Resources/immodules $(COQIDEAPP)/Contents/Resources/loaders $(COQIDEAPP)/Contents $(COQIDEINAPP)
 	$(MKDIR) $@
 	macpack -d ../Resources/lib $(COQIDEINAPP)
-	for i in $@/../loaders/*.so $@/../immodules/*.dylib; \
+	for i in $@/../loaders/*.so $@/../immodules/*.{dylib,so}; \
 	do \
 	  macpack -d ../lib $$i; \
 	done
-- 
cgit v1.2.3