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 /vapigen | |
| parent | 294b374af6e37cdac8ffb2b2db8fed72d323edb3 (diff) | |
| download | vala-abbcceab2fc3b674d1bb5d056f249c11cd5079a4.tar.gz | |
Add version suffix to installed files to allow parallel installation
Diffstat (limited to 'vapigen')
| -rw-r--r-- | vapigen/Makefile.am | 10 | ||||
| -rw-r--r-- | vapigen/vala-gen-introspect/Makefile.am | 4 | ||||
| -rwxr-xr-x | vapigen/vala-gen-introspect/vala-gen-introspect.in | 2 |
3 files changed, 13 insertions, 3 deletions
diff --git a/vapigen/Makefile.am b/vapigen/Makefile.am index dad0d5d6d..2f08351fa 100644 --- a/vapigen/Makefile.am +++ b/vapigen/Makefile.am @@ -50,18 +50,24 @@ vapicheck.vala.stamp: $(vapicheck_VALASOURCES) vapigen_LDADD = \ $(GLIB_LIBS) \ - ../codegen/libvala.la \ + ../codegen/libvala@PACKAGE_SUFFIX@.la \ ../gobject-introspection/libgidl.la \ $(NULL) vapicheck_LDADD = \ $(GLIB_LIBS) \ - ../codegen/libvala.la \ + ../codegen/libvala@PACKAGE_SUFFIX@.la \ ../gobject-introspection/libgidl.la \ $(NULL) EXTRA_DIST = $(vapigen_VALASOURCES) $(vapicheck_VALASOURCES) vapigen.vala.stamp vapicheck.vala.stamp +if ENABLE_UNVERSIONED +install-exec-hook: + cd $(DESTDIR)$(bindir) && $(LN_S) -f vapigen@PACKAGE_SUFFIX@$(EXEEXT) vapigen$(EXEEXT) + cd $(DESTDIR)$(bindir) && $(LN_S) -f vapicheck@PACKAGE_SUFFIX@$(EXEEXT) vapicheck$(EXEEXT) +endif + MAINTAINERCLEANFILES = \ $(vapigen_VALASOURCES:.vala=.c) \ $(vapicheck_VALASOURCES:.vala=.c) \ diff --git a/vapigen/vala-gen-introspect/Makefile.am b/vapigen/vala-gen-introspect/Makefile.am index 91dea9965..4f0c47186 100644 --- a/vapigen/vala-gen-introspect/Makefile.am +++ b/vapigen/vala-gen-introspect/Makefile.am @@ -8,3 +8,7 @@ EXTRA_DIST = \ vala-gen-introspect.in $(NULL) +if ENABLE_UNVERSIONED +install-exec-hook: + cd $(DESTDIR)$(bindir) && $(LN_S) -f vala-gen-introspect@PACKAGE_SUFFIX@$(EXEEXT) vala-gen-introspect$(EXEEXT) +endif diff --git a/vapigen/vala-gen-introspect/vala-gen-introspect.in b/vapigen/vala-gen-introspect/vala-gen-introspect.in index 538f43d98..5a93986a4 100755 --- a/vapigen/vala-gen-introspect/vala-gen-introspect.in +++ b/vapigen/vala-gen-introspect/vala-gen-introspect.in @@ -3,7 +3,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ -pkglibdir=${libdir}/vala +pkglibdir=${libdir}/vala@PACKAGE_SUFFIX@ if [ $# -ne 2 ] then |