summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2012-10-30 23:46:31 -0400
committerMark H Weaver <mhw@netris.org>2012-10-30 23:46:31 -0400
commitfa980bcc0f5b186b98d84fc5d165d35fcbb5d5ec (patch)
tree411ee841f7526fe7138e42cf399911518df06309 /meta
parente088b09d7dce5d78c96288778969876b6d25d726 (diff)
parent10744b7c5007ccac19ea9654be6e749fe6a60992 (diff)
downloadguile-fa980bcc0f5b186b98d84fc5d165d35fcbb5d5ec.tar.gz
Merge remote-tracking branch 'origin/stable-2.0'
Moved scm_i_struct_hash from struct.c to hash.c and made it static. The port's alist is now a field of 'scm_t_port'. Conflicts: libguile/arrays.c libguile/hash.c libguile/ports.c libguile/print.h libguile/read.c
Diffstat (limited to 'meta')
-rw-r--r--meta/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/Makefile.am b/meta/Makefile.am
index acf885490..c9d6a3fd7 100644
--- a/meta/Makefile.am
+++ b/meta/Makefile.am
@@ -28,7 +28,7 @@ EXTRA_DIST= \
guild.in guile-config.in
# What we now call `guild' used to be known as `guile-tools'.
-install-data-hook:
+install-exec-hook:
guild="`echo $(ECHO_N) guild \
| $(SED) -e '$(program_transform_name)'`$(EXEEXT)" ; \
guile_tools="`echo $(ECHO_N) guile-tools \