X-Git-Url: https://git.hcoop.net/bpt/guile.git/blobdiff_plain/df655031011719067e2b6819572a262028bb4858..6dd98109020997d22f78d9cd516d7809c4fcc493:/meta/Makefile.am

diff --git a/meta/Makefile.am b/meta/Makefile.am
index 5b811c06f..b96483bbd 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, 2013 Free Software Foundation, Inc.
 ##
 ##   This file is part of GUILE.
 ##   
@@ -27,9 +28,13 @@ EXTRA_DIST= \
   guild.in guile-config.in
 
 # 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)
+install-exec-hook:
+	guild="`echo $(ECHO_N) guild				\
+	   | $(SED) -e '$(program_transform_name)'`" ;		\
+	guile_tools="`echo $(ECHO_N) guile-tools		\
+	   | $(SED) -e '$(program_transform_name)'`" ;		\
+	cd $(DESTDIR)$(bindir) && rm -f "$$guile_tools" &&	\
+	$(LN_S) "$$guild" "$$guile_tools"
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = guile-2.2.pc
@@ -41,10 +46,10 @@ aclocal_DATA = guile.m4
 
 guile-config: $(srcdir)/guile-config.in $(top_builddir)/config.status
 	guile="@bindir@/`echo guile | $(SED) -e '$(program_transform_name)'`" ;	\
-	cat $(srcdir)/guile-config.in							\
-	| $(SED) -e "s,@pkgconfigdir@,$(pkgconfigdir),g ;			\
-		     s,@""PKG_CONFIG@,$(PKG_CONFIG),g ;				\
-		     s,@installed_guile@,$$guile,g"				\
+	cat $(srcdir)/guile-config.in						\
+	| $(SED) -e "s,@pkgconfigdir@,$(pkgconfigdir),g"			\
+		 -e "s,@""PKG_CONFIG@,$(PKG_CONFIG),g"				\
+		 -e "s,@installed_guile@,$$guile,g"				\
 	> guile-config.out
 	mv guile-config.out guile-config
 	chmod +x guile-config