diff options
| author | Andy Wingo <wingo@pobox.com> | 2012-05-21 19:20:27 +0200 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2012-05-21 19:20:27 +0200 |
| commit | 74bbb99457c661a98fbdde0c0504da1b3a053fc3 (patch) | |
| tree | 654f0a4cf3d4f8441d2b2638f4d8af7adde24846 /meta | |
| parent | 730af462c387ce9cca30e84b8963edba10399d2e (diff) | |
| parent | 15bb587f45b718f08756993fec9274212cc7df58 (diff) | |
Merge remote-tracking branch 'origin/stable-2.0'
Conflicts:
module/language/tree-il/analyze.scm
module/language/tree-il/effects.scm
module/language/tree-il/fix-letrec.scm
module/language/tree-il/peval.scm
test-suite/tests/cse.test
test-suite/tests/peval.test
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/Makefile.am | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/meta/Makefile.am b/meta/Makefile.am index 5b811c06f..acf885490 100644 --- a/meta/Makefile.am +++ b/meta/Makefile.am @@ -1,7 +1,8 @@ ## Process this file with Automake to create Makefile.in ## Jim Blandy <jimb@red-bean.com> --- September 1997 ## -## Copyright (C) 1998, 1999, 2001, 2006, 2007, 2008, 2009, 2011 Free Software Foundation, Inc. +## Copyright (C) 1998, 1999, 2001, 2006, 2007, 2008, 2009, 2011, +## 2012 Free Software Foundation, Inc. ## ## This file is part of GUILE. ## @@ -28,8 +29,12 @@ EXTRA_DIST= \ # What we now call `guild' used to be known as `guile-tools'. install-data-hook: - cd $(DESTDIR)$(bindir) && rm -f guile-tools$(EXEEXT) && \ - $(LN_S) guild$(EXEEXT) guile-tools$(EXEEXT) + guild="`echo $(ECHO_N) guild \ + | $(SED) -e '$(program_transform_name)'`$(EXEEXT)" ; \ + guile_tools="`echo $(ECHO_N) guile-tools \ + | $(SED) -e '$(program_transform_name)'`$(EXEEXT)" ; \ + cd $(DESTDIR)$(bindir) && rm -f "$$guile_tools" && \ + $(LN_S) "$$guild" "$$guile_tools" pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = guile-2.2.pc |