diff options
Diffstat (limited to 'lang/gauche/files/patch-src_Makefile.in')
-rw-r--r-- | lang/gauche/files/patch-src_Makefile.in | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/lang/gauche/files/patch-src_Makefile.in b/lang/gauche/files/patch-src_Makefile.in index f518a1811764..276ebd04c956 100644 --- a/lang/gauche/files/patch-src_Makefile.in +++ b/lang/gauche/files/patch-src_Makefile.in @@ -1,6 +1,6 @@ ---- src/Makefile.in.orig 2016-10-02 07:41:35 UTC +--- src/Makefile.in.orig 2018-06-30 03:25:22 UTC +++ src/Makefile.in -@@ -248,7 +248,7 @@ test-extra$(EXEEXT) : $(LIBGAUCHE).$(SOEXT) $(test_ext +@@ -259,7 +259,7 @@ test-extra$(EXEEXT) : $(LIBGAUCHE).$(SOEXT) $(test_ext # need to relink gosh-noconsole.exe (windows no-console version). relink : $(RELINK) $(libgauche_LDFLAGS) $(LIBGAUCHE).$(SOEXT) $(libgauche_OBJECTS) $(libgc_pic_LIBRARY) $(GC_ATOMIC_OPS_LIBS) $(LIBS) @@ -9,16 +9,25 @@ $(RELINK) -o gauche-config$(EXEEXT) gauche-config.$(OBJEXT) $(LIBS) $(OBJECTS) : $(HEADERS) -@@ -510,8 +510,10 @@ install-relink : install-aux +@@ -417,7 +417,7 @@ $(LIBGAUCHE_STATIC).a : all $(STATICINIT_OBJS) + `if [ X$(libgc_pic_LIBRARY) != X ]; then echo $(libgc_pic_OBJECTS); fi` \ + `if [ X$(libatomic_ops_pic_LIBRARY) != X ]; then echo $(libatomic_ops_pic_OBJECTS); fi` \ + $(STATICINIT_OBJS) \ +- `"$(srcdir)/list-ext-objects.sh" "$(top_builddir)"` ++ `MAKE=$(MAKE) "$(srcdir)/list-ext-objects.sh" "$(top_builddir)"` + + $(STATICINIT_SRCS) : all gen-staticinit.scm + $(STATIC_GOSH) $(srcdir)/gen-staticinit.scm $(top_srcdir) $(top_builddir) +@@ -537,8 +537,10 @@ install-relink : install-aux install-core : install-relink - $(INSTALL) $(INSTALL_LIBS) $(DESTDIR)$(LIB_INSTALL_DIR) - $(INSTALL) $(INSTALL_LIBS) $(DESTDIR)$(ARCH_INSTALL_DIR) -- $(INSTALL) -m 555 $(INSTALL_BINS) $(DESTDIR)$(BIN_INSTALL_DIR) -- $(INSTALL) -m 555 $(INSTALL_BINS) $(DESTDIR)$(ARCH_INSTALL_DIR) -+ $(INSTALL) -m 555 $(INSTALL_BINS:Ngosh$(EXEEXT)) $(DESTDIR)$(BIN_INSTALL_DIR) -+ $(INSTALL) -m 555 gosh-relinked$(EXEEXT) $(DESTDIR)$(BIN_INSTALL_DIR)/gosh$(EXEEXT) -+ $(INSTALL) -m 555 $(INSTALL_BINS:Ngosh$(EXEEXT)) $(DESTDIR)$(ARCH_INSTALL_DIR) -+ $(INSTALL) -m 555 gosh-relinked$(EXEEXT) $(DESTDIR)$(ARCH_INSTALL_DIR)/gosh$(EXEEXT) + $(INSTALL) $(INSTALL_LIBS) "$(DESTDIR)$(LIB_INSTALL_DIR)" + $(INSTALL) $(INSTALL_LIBS) "$(DESTDIR)$(ARCH_INSTALL_DIR)" +- $(INSTALL) -m 555 $(INSTALL_BINS) "$(DESTDIR)$(BIN_INSTALL_DIR)" +- $(INSTALL) -m 555 $(INSTALL_BINS) "$(DESTDIR)$(ARCH_INSTALL_DIR)" ++ $(INSTALL) -m 555 $(filter-out gosh$(EXEEXT),$(INSTALL_BINS)) "$(DESTDIR)$(BIN_INSTALL_DIR)" ++ $(INSTALL) -m 555 gosh-relinked$(EXEEXT) "$(DESTDIR)$(BIN_INSTALL_DIR)/gosh$(EXEEXT)" ++ $(INSTALL) -m 555 $(filter-out gosh$(EXEEXT),$(INSTALL_BINS)) "$(DESTDIR)$(ARCH_INSTALL_DIR)" ++ $(INSTALL) -m 555 gosh-relinked$(EXEEXT) "$(DESTDIR)$(ARCH_INSTALL_DIR)/gosh$(EXEEXT)" @case `$(GAUCHE_CONFIG) --arch` in *-cygwin*|*-mingw*) \ - $(INSTALL) $(INSTALL_LIBS) $(DESTDIR)$(BIN_INSTALL_DIR);;\ + $(INSTALL) $(INSTALL_LIBS) "$(DESTDIR)$(BIN_INSTALL_DIR)";;\ esac |