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

author Pete Fotheringham <pete.fotheringham@codethink.co.uk>

Sun, 1 Jan 2012 17:33:12 +0000 (17:33 +0000)

committer Pete Fotheringham <pete.fotheringham@codethink.co.uk>

Sun, 1 Jan 2012 17:54:13 +0000 (17:54 +0000)
author Pete Fotheringham <pete.fotheringham@codethink.co.uk>
Sun, 1 Jan 2012 17:33:12 +0000 (17:33 +0000)
committer Pete Fotheringham <pete.fotheringham@codethink.co.uk>
Sun, 1 Jan 2012 17:54:13 +0000 (17:54 +0000)
diff --combined include/Makefile.am

index 5ea5be2,5ea5be2..203400d
--- 1/include/Makefile.am
--- 2/include/Makefile.am
+++ b/include/Makefile.am
@@@ -59,7 -59,7 +59,7 @@@ EXTRA_DIST = NTMakefil
   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
author	Pete Fotheringham <pete.fotheringham@codethink.co.uk>
	Sun, 1 Jan 2012 17:33:12 +0000 (17:33 +0000)
committer	Pete Fotheringham <pete.fotheringham@codethink.co.uk>
	Sun, 1 Jan 2012 17:54:13 +0000 (17:54 +0000)