dmbcs/guile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'local-2.0/stable-2.0'

Browse source 
Conflicts:
	meta/Makefile.am
This commit is contained in:
Andy Wingo 2011-06-02 22:49:33 +02:00
commit 46da7909e1
21 changed files with 202 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

9
meta/Makefile.am
View file

@ -20,11 +20,16 @@
## write to the Free Software Foundation, Inc., 51 Franklin Street,
## Fifth Floor, Boston, MA 02110-1301 USA
bin_SCRIPTS = guile-config guile-tools
bin_SCRIPTS = guile-config guild
EXTRA_DIST= \
guile.m4 ChangeLog-2008 \
guile-2.2.pc.in guile-2.2-uninstalled.pc.in \
guile-tools.in guile-config.in
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)
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = guile-2.2.pc