build-sys: set MONO_SHARED_DIR= to avoid build env troubles on redhat (stolen from...

diff --git a/avahi-daemon/chroot.c b/avahi-daemon/chroot.c
index 4420c41d8105ffe382a8e7895f721f007be20a01..6b9876b7338eb60ab86b60df74f1735e3e09eea4 100644 (file)
--- a/avahi-daemon/chroot.c
+++ b/avahi-daemon/chroot.c
@@ -104,8 +104,8 @@ static int send_fd(int fd, int payload_fd) {
     struct iovec iov;
     struct msghdr msg;
     union {
-       struct cmsghdr hdr;
-       char buf[CMSG_SPACE(sizeof(int))];
+        struct cmsghdr hdr;
+        char buf[CMSG_SPACE(sizeof(int))];
     } cmsg;
 
     /* Send a file descriptor over the socket */
@@ -144,8 +144,8 @@ static int recv_fd(int fd) {
     struct iovec iov;
     struct msghdr msg;
     union {
-       struct cmsghdr hdr;
-       char buf[CMSG_SPACE(sizeof(int))];
+        struct cmsghdr hdr;
+        char buf[CMSG_SPACE(sizeof(int))];
     } cmsg;
 
     /* Receive a file descriptor from a socket */

diff --git a/avahi-sharp/Makefile.am b/avahi-sharp/Makefile.am
index 3fa10abc922f61f408b45a787cfb9ac22b6a5293..1fdb1ca3d3f733b5642ff63f43674be69caedc9d 100644 (file)
--- a/avahi-sharp/Makefile.am
+++ b/avahi-sharp/Makefile.am
@@ -46,7 +46,7 @@ EXTRA_DIST =                          \
        $(srcdir)/gencfg.sh
 
 $(ASSEMBLY): $(AVAHISOURCES)
-       $(AM_V_GEN)mcs -keyfile:$(srcdir)/avahi.snk -target:library -out:$@ -debug $(AVAHISOURCES) -r:Mono.Posix
+       $(AM_V_GEN)MONO_SHARED_DIR=. mcs -keyfile:$(srcdir)/avahi.snk -target:library -out:$@ -debug $(AVAHISOURCES) -r:Mono.Posix
 
 
 $(ASSEMBLY).config: $(ASSEMBLY).config.in
@@ -73,10 +73,10 @@ monodoc_DATA = avahi-sharp-docs.zip avahi-sharp-docs.tree avahi-sharp-docs.sourc
 endif
 
 install-data-hook: $(ASSEMBLY)
-       $(AM_V_GEN)$(GACUTIL) /i $(ASSEMBLY) /package avahi-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
+       $(AM_V_GEN)MONO_SHARED_DIR=. $(GACUTIL) /i $(ASSEMBLY) /package avahi-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
 
 uninstall-hook: $(ASSEMBLY)
-       $(AM_V_GEN)$(GACUTIL) /u avahi-sharp /package avahi-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
+       $(AM_V_GEN)MONO_SHARED_DIR=. $(GACUTIL) /u avahi-sharp /package avahi-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
 
 endif
 endif