aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarius Halden <marius.h@lden.org>2017-07-04 20:11:43 +0200
committerMarius Halden <marius.h@lden.org>2017-07-04 20:11:43 +0200
commit06a545c5a849d1b1b99839539c9f0e302b594255 (patch)
tree0c7ff84035e39630291a572c38817439610a9fd2
parent52b77bf257ac24a69f596748c5c56af1f0cdac86 (diff)
parentb9c10a1afa791d531c70df88874d07f34b26eb90 (diff)
Merge branch 'master' into patched-master
-rw-r--r--Makefile1
-rwxr-xr-xconfigure2
2 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 25c04b2b..25c37dcd 100644
--- a/Makefile
+++ b/Makefile
@@ -101,6 +101,7 @@ install-bin:
$(INSTALL) -m 0755 $(OUTFILE) $(DESTDIR)$(SBINDIR)/$(OUTFILE)
ifdef IMPLIB
# import library for cygwin
+ mkdir -p $(DESTDIR)$(LIBDIR)
$(INSTALL) -m 0644 $(IMPLIB) $(DESTDIR)$(LIBDIR)/$(IMPLIB)
endif
diff --git a/configure b/configure
index fcbedc90..096640db 100755
--- a/configure
+++ b/configure
@@ -815,7 +815,7 @@ fi
pkgconfiglibs=''
case "$arch" in
CYGWIN* )
- pkgconfiglibs='-L${libdir} -lbitlbee'
+ pkgconfiglibs='-L${libdir} -lbitlbee -no-undefined'
esac
cat <<EOF >bitlbee.pc