blob: a676feaf14840668d36ac6599c1391712e51baa1 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
|
--- src/Makefile.in.orig 2024-01-25 23:46:19 UTC
+++ src/Makefile.in
@@ -77,16 +77,16 @@ GAUCHE_VERSION = @GAUCHE_VERSION@
GAUCHE_ABI_VERSION = @GAUCHE_ABI_VERSION@
# Main definition of compilation commands
-ATOMIC_OPS_CFLAGS = `${srcdir}/get-atomic-ops-flags.sh ${top_builddir} ${top_srcdir} --cflags`
-ATOMIC_OPS_LIBS = `${srcdir}/get-atomic-ops-flags.sh ${top_builddir} ${top_srcdir} --libs`
+ATOMIC_OPS_CFLAGS = $(shell ${srcdir}/get-atomic-ops-flags.sh ${top_builddir} ${top_srcdir} --cflags)
+ATOMIC_OPS_LIBS = $(shell ${srcdir}/get-atomic-ops-flags.sh ${top_builddir} ${top_srcdir} --libs)
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(OPTFLAGS)
MKINSTDIR = $(top_srcdir)/mkinstalldirs
CCLD = $(LINK_HELPER) $(CC)
-LINK = TARGETLIB="`pwd`" $(CCLD) $(CFLAGS) $(RPATH_TMP) -L. $(LDFLAGS)
+LINK = TARGETLIB="$(CURDIR)" $(CCLD) $(CFLAGS) $(RPATH_TMP) -L. $(LDFLAGS)
RELINK = TARGETLIB="$(TARGETLIB)" $(CCLD) $(CFLAGS) $(RPATH_REAL) -L. $(LDFLAGS)
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
-POSTBUILD = TARGETLIB="`pwd`" DESTDIR= $(MAKEVERSLINK) $(LIBGAUCHE).$(SOEXT)
+POSTBUILD = TARGETLIB="$(CURDIR)" DESTDIR= $(MAKEVERSLINK) $(LIBGAUCHE).$(SOEXT)
POSTINSTALL = TARGETLIB="$(TARGETLIB)" DESTDIR="$(DESTDIR)" $(MAKEVERSLINK) $(LIBGAUCHE).$(SOEXT) ; \
TARGETLIB="$(LIB_INSTALL_DIR)" DESTDIR="$(DESTDIR)" $(MAKEVERSLINK) $(LIBGAUCHE).$(SOEXT)
PREUNINSTALL = TARGETLIB="$(TARGETLIB)" DESTDIR="$(DESTDIR)" $(MAKEVERSLINK) -d $(LIBGAUCHE).$(SOEXT); \
@@ -285,7 +285,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) $(ATOMIC_OPS_LIBS) $(LIBS)
- $(RELINK) $(gosh_LDFLAGS) -o gosh$(EXEEXT) $(gosh_OBJECTS) $(gosh_LDADD) $(LIBS)
+ $(RELINK) $(gosh_LDFLAGS) -o gosh-relinked$(EXEEXT) $(gosh_OBJECTS) $(gosh_LDADD) $(LIBS)
$(RELINK) -o gauche-config$(EXEEXT) gauche-config.$(OBJEXT) $(LIBS)
$(OBJECTS) : $(HEADERS)
@@ -597,8 +597,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 $(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 $(host) in *-cygwin*|*-mingw*) \
$(INSTALL) $(INSTALL_LIBS) "$(DESTDIR)$(BIN_INSTALL_DIR)";;\
esac
|
