[build] Fix handling of the SmartIrc4net assembly

Pass the proper configure options to SmartIrc4net for bundling.
The SmartIrc4net assembly is now copied into bin/ during compilation,
and installed into the same folder as the other assemblies.
This commit is contained in:
Bertrand Lorentz 2010-09-11 19:58:59 +02:00
parent 176b20a9e1
commit 8ac0b8c71d
3 changed files with 25 additions and 1 deletions

View file

@ -10,6 +10,9 @@ SUBDIRS = \
data \
po
clean-local:
rm -rf $(top_builddir)/bin
EXTRA_DIST = gnome-doc-utils.make
DISTCLEANFILES = \

View file

@ -15,4 +15,18 @@ SOURCES = \
SparklePlatform.cs \
SparkleRepo.cs
SMARTIRC4NET_FILES_EXPANDED = $(foreach file, $(SMARTIRC4NET_FILES), $(top_builddir)/$(file))
EXTRA_BUNDLE = $(SMARTIRC4NET_FILES_EXPANDED)
install-data-hook:
for ASM in $(SMARTIRC4NET_FILES_EXPANDED); do \
$(INSTALL) -m 0755 $$ASM $(DESTDIR)$(moduledir); \
done;
uninstall-hook:
for ASM in $(SMARTIRC4NET_FILES_EXPANDED); do \
rm -f $(DESTDIR)$(moduledir)/`basename $$ASM`; \
done;
include $(top_srcdir)/build/build.mk

View file

@ -3,7 +3,14 @@ AC_DEFUN([SPARKLESHARE_SMARTIRC4NET],
if test ! -d "$srcdir/SmartIrc4net"; then
AC_MSG_ERROR([SmartIrc4net folder not found])
fi
ac_configure_args="$ac_configure_args --disable-pkg-config --disable-pkg-lib --disable-pkg-gac"
AC_CONFIG_SUBDIRS([SmartIrc4net])
AC_SUBST([SMARTIRC4NET_ASSEMBLY], "SmartIrc4net/bin/Meebey.SmartIrc4net.dll")
asm="SmartIrc4net/bin/Meebey.SmartIrc4net.dll"
SMARTIRC4NET_ASSEMBLY="$asm"
SMARTIRC4NET_FILES="$asm"
[[ -r "$asm.mdb" ]] && SMARTIRC4NET_FILES="$SMARTIRC4NET_FILES $asm.mdb"
AC_SUBST([SMARTIRC4NET_ASSEMBLY])
AC_SUBST([SMARTIRC4NET_FILES])
])