[build] Fix handling of additional dependencies of GitSharp
The bundled assemblies are in srcdir, so we need to get them from there.
This commit is contained in:
parent
8bd7ee9df2
commit
e9774facef
|
@ -17,8 +17,9 @@ SOURCES = \
|
||||||
|
|
||||||
SMARTIRC4NET_FILES_EXPANDED = $(foreach file, $(SMARTIRC4NET_FILES), $(top_builddir)/$(file))
|
SMARTIRC4NET_FILES_EXPANDED = $(foreach file, $(SMARTIRC4NET_FILES), $(top_builddir)/$(file))
|
||||||
GITSHARP_FILES_EXPANDED = $(foreach file, $(GITSHARP_FILES), $(top_builddir)/$(file))
|
GITSHARP_FILES_EXPANDED = $(foreach file, $(GITSHARP_FILES), $(top_builddir)/$(file))
|
||||||
|
GITSHARP_DEPS_EXPANDED = $(foreach file, $(GITSHARP_DEPS), $(top_srcdir)/$(file))
|
||||||
|
|
||||||
EXTRA_BUNDLE = $(SMARTIRC4NET_FILES_EXPANDED) $(GITSHARP_FILES_EXPANDED)
|
EXTRA_BUNDLE = $(SMARTIRC4NET_FILES_EXPANDED) $(GITSHARP_FILES_EXPANDED) $(GITSHARP_DEPS_EXPANDED)
|
||||||
|
|
||||||
install-data-hook:
|
install-data-hook:
|
||||||
for ASM in $(EXTRA_BUNDLE); do \
|
for ASM in $(EXTRA_BUNDLE); do \
|
||||||
|
|
|
@ -15,9 +15,10 @@ AC_DEFUN([SPARKLESHARE_GITSHARP],
|
||||||
[[ -r "$asm.mdb" ]] && GITSHARP_FILES="$GITSHARP_FILES $asm.mdb"
|
[[ -r "$asm.mdb" ]] && GITSHARP_FILES="$GITSHARP_FILES $asm.mdb"
|
||||||
done
|
done
|
||||||
# Additional dependencies that we need to install
|
# Additional dependencies that we need to install
|
||||||
GITSHARP_FILES="$GITSHARP_FILES GitSharp/lib/DiffieHellman.dll GitSharp/lib/Org.Mentalis.Security.dll"
|
GITSHARP_DEPS="GitSharp/lib/DiffieHellman.dll GitSharp/lib/Org.Mentalis.Security.dll"
|
||||||
|
|
||||||
AC_SUBST([GITSHARP_ASSEMBLIES])
|
AC_SUBST([GITSHARP_ASSEMBLIES])
|
||||||
AC_SUBST([GITSHARP_FILES])
|
AC_SUBST([GITSHARP_FILES])
|
||||||
|
AC_SUBST([GITSHARP_DEPS])
|
||||||
])
|
])
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue