Merge branch 'master', remote-tracking branch 'origin'

diff --git a/include/Makefile.am b/include/Makefile.am
index 5ea5be2..203400d 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -59,7 +59,7 @@ EXTRA_DIST = NTMakefile
 DISTCLEANFILES = md5global.h
 
 if MACOSX
-framedir = /Library/Frameworks/SASL2.framework
+framedir = $(DESTDIR)/Library/Frameworks/SASL2.framework
 frameheaderdir = $(framedir)/Versions/A/Headers
 frameheader_DATA = $(saslinclude_HEADERS)
 endif