diff options
| author | Mark H Weaver <mhw@netris.org> | 2013-04-14 02:48:33 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2013-04-14 02:48:33 -0400 |
| commit | f6f4feb0a2222efcb297e634603621126542e63f (patch) | |
| tree | 0b590c025f688ab625827c4f692fa7783716b558 /meta | |
| parent | 1e051065628a7f1bd4398fcc11cd181f86084629 (diff) | |
| parent | f5b2eea6a39507ecf6a8ecc62cc1c796c45c2d1d (diff) | |
Merge remote-tracking branch 'origin/stable-2.0'
Conflicts:
GUILE-VERSION
libguile/array-map.c
libguile/fports.h
libguile/gc.h
libguile/inline.h
libguile/ports.c
libguile/ports.h
libguile/print.c
libguile/r6rs-ports.c
libguile/read.c
test-suite/tests/00-socket.test
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/Makefile.am b/meta/Makefile.am index 184c0d920..b96483bbd 100644 --- a/meta/Makefile.am +++ b/meta/Makefile.am @@ -30,9 +30,9 @@ EXTRA_DIST= \ # What we now call `guild' used to be known as `guile-tools'. install-exec-hook: guild="`echo $(ECHO_N) guild \ - | $(SED) -e '$(program_transform_name)'`$(EXEEXT)" ; \ + | $(SED) -e '$(program_transform_name)'`" ; \ guile_tools="`echo $(ECHO_N) guile-tools \ - | $(SED) -e '$(program_transform_name)'`$(EXEEXT)" ; \ + | $(SED) -e '$(program_transform_name)'`" ; \ cd $(DESTDIR)$(bindir) && rm -f "$$guile_tools" && \ $(LN_S) "$$guild" "$$guile_tools" |