From: Pete Fotheringham <pete.fotheringham@codethink.co.uk>
Date: Sun, 1 Jan 2012 17:33:12 +0000 (+0000)
Subject: Merge branch 'master' of ssh://moonshot-v4/srv/git/cyrus-sasl
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=cyrus-sasl.git;a=commitdiff_plain;h=01ea92639353516560f32143b79e40f1f1aa2f50

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

01ea92639353516560f32143b79e40f1f1aa2f50
diff --cc include/Makefile.am
index 5ea5be2,5ea5be2..203400d
--- a/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