diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2023-01-22 09:44:43 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2023-01-22 09:44:43 +0000 |
| commit | cfbafbf69f29d92d0e3435367964d7e256a4deff (patch) | |
| tree | cb7a8af818bbbce338d40630472ded4f2bf95580 /xserver/hw/xquartz/Makefile.am | |
| parent | 5137be12226ec726cde8f1b16f38c9d0f63c8281 (diff) | |
Merge xserver 21.1.6.
Includes a few fixes to the security patches already committed.
Diffstat (limited to 'xserver/hw/xquartz/Makefile.am')
| -rw-r--r-- | xserver/hw/xquartz/Makefile.am | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/xserver/hw/xquartz/Makefile.am b/xserver/hw/xquartz/Makefile.am index 222f3b1d4..9db38c403 100644 --- a/xserver/hw/xquartz/Makefile.am +++ b/xserver/hw/xquartz/Makefile.am @@ -2,14 +2,14 @@ noinst_LTLIBRARIES = libXquartz.la AM_CFLAGS = $(DIX_CFLAGS) AM_OBJCFLAGS = $(DIX_CFLAGS) AM_CPPFLAGS = \ + -DXQUARTZ_DATA_DIR=\"$(datadir)/X11/XQuartz\" \ -DXSERVER_VERSION=\"$(VERSION)\" \ -DBUNDLE_ID_PREFIX=\"$(BUNDLE_ID_PREFIX)\" \ -DUSE_NEW_CLUT \ -DXFree86Server \ -I$(top_srcdir)/miext/rootless \ -I$(top_builddir)/pseudoramiX \ - -I$(top_builddir) \ - -DX11LIBDIR=\"$(libdir)\" + -I$(top_builddir)" if GLX GL_DIR = GL @@ -45,6 +45,7 @@ EXTRA_DIST = \ darwin.h \ darwinfb.h \ darwinEvents.h \ + defaults.plist \ keysym2ucs.h \ quartz.h \ quartzKeyboard.h \ |