From f008c76d0ee59dcebd16986436ca32377b273a03 Mon Sep 17 00:00:00 2001
From: Jonathan Helmus <jjhelmus@gmail.com>
Date: Tue, 30 Oct 2018 10:24:54 -0500
Subject: [PATCH 2/6] adjust Makefile.am files for osx

---
 Makefile.am         | 15 +--------------
 include/Makefile.am |  6 ------
 lib/Makefile.am     |  8 --------
 3 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 2091dd1..2e78217 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -63,11 +63,6 @@ JAV = java
 else
 JAV =
 endif
-if MACOSX
-INSTALLOSX = install-exec-local-osx
-else 
-INSTALLOSX = 
-endif
 
 SUBDIRS=include sasldb lib plugins utils doc man $(PWC) $(SAM) $(JAV) $(SAD)
 EXTRA_DIST=config cmulocal win32 mac dlcompat-20010505 NTMakefile INSTALL.TXT \
@@ -81,8 +76,7 @@ dist-hook:
 	@find $(distdir) -name CVS -print | xargs -t rm -rf
 	(cd $(distdir)/plugins && sh makeinit.sh)
 
-framedir = /Library/Frameworks/SASL2.framework
-install-exec-local: $(INSTALLOSX)
+install-exec-local:
 	@if test "$(plugindir)" != "$(prefix)/lib/sasl2"; then \
 	  echo "********************************************************"; \
 	  echo "* WARNING:"; \
@@ -100,11 +94,4 @@ install-exec-local: $(INSTALLOSX)
 	  echo "* the library should use."; \
 	  echo "********************************************************"; \
 	fi
-install-exec-local-osx:
-	$(mkinstalldirs) $(framedir)/Versions/A/Headers
-	$(mkinstalldirs) $(framedir)/Versions/A/Resources
-	cd $(framedir)/Versions ; ln -fs A Current
-	cd $(framedir) ; ln -fs Versions/A/Headers .
-	cd $(framedir) ; ln -fs Versions/A/Resources .
-	$(INSTALL_DATA) $(srcdir)/config/Info.plist $(framedir)/Versions/A/Resources
 
diff --git a/include/Makefile.am b/include/Makefile.am
index 5ea5be2..55f6d22 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -57,9 +57,3 @@ md5global.h: makemd5
 
 EXTRA_DIST = NTMakefile
 DISTCLEANFILES = md5global.h
-
-if MACOSX
-framedir = /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 b8964a8..fcc99b6 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -68,15 +68,7 @@ libsasl2_la_LDFLAGS = -version-info $(sasl_version)
 libsasl2_la_DEPENDENCIES = $(LTLIBOBJS)
 libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR)
 
-if MACOSX
-framedir = /Library/Frameworks/SASL2.framework
 install-exec-hook:
-	$(mkinstalldirs) $(framedir)/Versions/A
-	ln -fs $(libdir)/libsasl2.dylib $(framedir)/Versions/A/SASL2
-	cd $(framedir) ; ln -fs Versions/A/SASL2 .
-else
-install-exec-hook:
-endif
 
 libsasl2.a: libsasl2.la $(SASL_STATIC_OBJS)
 	@echo adding static plugins and dependencies
-- 
2.7.4

