diff options
| author | Jürg Billeter <j@bitron.ch> | 2010-08-05 10:17:48 +0200 |
|---|---|---|
| committer | Jürg Billeter <j@bitron.ch> | 2010-08-05 21:20:04 +0200 |
| commit | abbcceab2fc3b674d1bb5d056f249c11cd5079a4 (patch) | |
| tree | 90e6ecee787f5828fb669671dccbb8027c1321df /compiler | |
| parent | 294b374af6e37cdac8ffb2b2db8fed72d323edb3 (diff) | |
| download | vala-abbcceab2fc3b674d1bb5d056f249c11cd5079a4.tar.gz | |
Add version suffix to installed files to allow parallel installation
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/Makefile.am | 8 | ||||
| -rw-r--r-- | compiler/valacompiler.vala | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/compiler/Makefile.am b/compiler/Makefile.am index bbc933580..d6e7f819b 100644 --- a/compiler/Makefile.am +++ b/compiler/Makefile.am @@ -32,13 +32,17 @@ valac.vala.stamp: $(valac_VALASOURCES) valac_LDADD = \ $(COVERAGE_LIBS) \ $(GLIB_LIBS) \ - ../codegen/libvala.la \ + ../codegen/libvala@PACKAGE_SUFFIX@.la \ $(NULL) EXTRA_DIST = $(valac_VALASOURCES) valac.vala.stamp install-exec-hook: - cd $(DESTDIR)$(bindir) && $(LN_S) -f valac$(EXEEXT) vala$(EXEEXT) + cd $(DESTDIR)$(bindir) && $(LN_S) -f valac@PACKAGE_SUFFIX@$(EXEEXT) vala@PACKAGE_SUFFIX@$(EXEEXT) +if ENABLE_UNVERSIONED + cd $(DESTDIR)$(bindir) && $(LN_S) -f valac@PACKAGE_SUFFIX@$(EXEEXT) valac$(EXEEXT) + cd $(DESTDIR)$(bindir) && $(LN_S) -f vala@PACKAGE_SUFFIX@$(EXEEXT) vala$(EXEEXT) +endif MAINTAINERCLEANFILES = \ $(valac_VALASOURCES:.vala=.c) \ diff --git a/compiler/valacompiler.vala b/compiler/valacompiler.vala index 97cca8821..0718f14a2 100644 --- a/compiler/valacompiler.vala +++ b/compiler/valacompiler.vala @@ -675,7 +675,7 @@ class Vala.Compiler { } static int main (string[] args) { - if (Path.get_basename (args[0]) == "vala") { + if (Path.get_basename (args[0]) == "vala" || Path.get_basename (args[0]) == "vala" + Config.PACKAGE_SUFFIX) { return run_source (args); } |