From 6a336a186e64dea1ba757f217f473cf3df9181c5 Mon Sep 17 00:00:00 2001 From: Nick Briggs Date: Tue, 15 Dec 2020 13:07:18 -0800 Subject: [PATCH] macOS installation of XQuartz when SIP is enabled does not link /usr/X11 to /opt/X11 (#73) --- bin/makefile-darwin.386-x | 4 ++-- bin/makefile-darwin.aarch64-x | 4 ++-- bin/makefile-darwin.x86_64-x | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bin/makefile-darwin.386-x b/bin/makefile-darwin.386-x index bb393a6..86ea8b1 100644 --- a/bin/makefile-darwin.386-x +++ b/bin/makefile-darwin.386-x @@ -26,8 +26,8 @@ DFLAGS = $(DEBUGFLAGS) -DFSERROR -DNEW_STORAGE -DMACOSX -DOLD_CURSOR \ -DBYTESWAP -DFORKCOMM -DNOFORN -DLOGINT $(XFLAGS) \ -DRELEASE=351 -DSTACKCHECK -DFSBCHECK -DPCTRACE -LDFLAGS = -L/usr/X11/lib -lX11 -lm -LDELDFLAGS = -L/usr/X11/lib -lX11 -lm +LDFLAGS = -L/opt/X11/lib -lX11 -lm +LDELDFLAGS = -L/opt/X11/lib -lX11 -lm INLINE = # $(SRCDIR)dspSPARC.il BITBLTFILE = # $(OBJECTDIR)bbtSPARC.o diff --git a/bin/makefile-darwin.aarch64-x b/bin/makefile-darwin.aarch64-x index f184e93..d020b28 100644 --- a/bin/makefile-darwin.aarch64-x +++ b/bin/makefile-darwin.aarch64-x @@ -26,8 +26,8 @@ DFLAGS = $(DEBUGFLAGS) -DFSERROR -DNEW_STORAGE -DMACOSX -DOLD_CURSOR \ -DBYTESWAP -DFORKCOMM -DNOFORN -DLOGINT $(XFLAGS) \ -DRELEASE=351 -LDFLAGS = -L/usr/X11/lib -lX11 -lm -LDELDFLAGS = -L/usr/X11/lib -lX11 -lm +LDFLAGS = -L/opt/X11/lib -lX11 -lm +LDELDFLAGS = -L/opt/X11/lib -lX11 -lm INLINE = # $(SRCDIR)dspSPARC.il BITBLTFILE = # $(OBJECTDIR)bbtSPARC.o diff --git a/bin/makefile-darwin.x86_64-x b/bin/makefile-darwin.x86_64-x index 1db5ae0..81f8818 100644 --- a/bin/makefile-darwin.x86_64-x +++ b/bin/makefile-darwin.x86_64-x @@ -26,8 +26,8 @@ DFLAGS = $(DEBUGFLAGS) -DFSERROR -DNEW_STORAGE -DMACOSX -DOLD_CURSOR \ -DBYTESWAP -DFORKCOMM -DNOFORN -DLOGINT $(XFLAGS) \ -DRELEASE=351 -LDFLAGS = -L/usr/X11/lib -lX11 -lm -LDELDFLAGS = -L/usr/X11/lib -lX11 -lm +LDFLAGS = -L/opt/X11/lib -lX11 -lm +LDELDFLAGS = -L/opt/X11/lib -lX11 -lm INLINE = # $(SRCDIR)dspSPARC.il BITBLTFILE = # $(OBJECTDIR)bbtSPARC.o