diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-06-25 20:46:15 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-06-25 20:46:15 +0200 |
| commit | d31d192207d6775cbd3f787c2e59d0e18911d679 (patch) | |
| tree | 7f319dc4954810a7875582f117af86f822e70dd3 | |
| parent | 06d83a3a2b90ede6093284c99659418886cc562a (diff) | |
build-sys: set MONO_SHARED_DIR= to avoid build env troubles on redhat (stolen from our rpms)
| -rw-r--r-- | avahi-daemon/chroot.c | 8 | ||||
| -rw-r--r-- | avahi-sharp/Makefile.am | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/avahi-daemon/chroot.c b/avahi-daemon/chroot.c index 4420c41..6b9876b 100644 --- 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 3fa10ab..1fdb1ca 100644 --- 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 |