Merge branch 'master' of ssh://moonshot-v4/srv/git/cyrus-sasl

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

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 894f131..a402b52 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -65,7 +65,7 @@ libsasl2_la_DEPENDENCIES = $(LTLIBOBJS)
 libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR)
 
 if MACOSX
-framedir = /Library/Frameworks/SASL2.framework
+framedir = $(DESTDIR)/Library/Frameworks/SASL2.framework
 install-exec-hook:
        $(mkinstalldirs) $(framedir)/Versions/A
        ln -fs $(libdir)/libsasl2.dylib $(framedir)/Versions/A/SASL2