Xquartz: Don't hardcode libexec dir
This commit is contained in:
parent
a5e796c60e
commit
67b479ef80
|
@ -2021,7 +2021,6 @@ hw/xnest/Makefile
|
|||
hw/xwin/Makefile
|
||||
hw/xquartz/Makefile
|
||||
hw/xquartz/bundle/Makefile
|
||||
hw/xquartz/bundle/org.x.X11.plist
|
||||
hw/xquartz/xpr/Makefile
|
||||
hw/kdrive/Makefile
|
||||
hw/kdrive/ati/Makefile
|
||||
|
|
|
@ -1,7 +1,3 @@
|
|||
libexec_PROGRAMS = x11-exec
|
||||
|
||||
x11_exec_LDFLAGS = -framework ApplicationServices
|
||||
|
||||
noinst_LTLIBRARIES = libXquartz.la
|
||||
AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS)
|
||||
AM_CPPFLAGS = \
|
||||
|
@ -14,6 +10,12 @@ AM_CPPFLAGS = \
|
|||
|
||||
if X11APP
|
||||
X11APP_SUBDIRS = bundle
|
||||
|
||||
if LAUNCHD
|
||||
libexec_PROGRAMS = x11-exec
|
||||
x11_exec_LDFLAGS = -framework ApplicationServices
|
||||
endif
|
||||
|
||||
endif
|
||||
|
||||
SUBDIRS = . xpr $(X11APP_SUBDIRS)
|
||||
|
|
|
@ -9,7 +9,14 @@ install-data-hook:
|
|||
xcodebuild install DSTROOT="/$(DESTDIR)" INSTALL_PATH="$(APPLE_APPLICATIONS_DIR)" DEPLOYMENT_LOCATION=YES SKIP_INSTALL=NO ARCHS="$(X11APP_ARCHS)"
|
||||
|
||||
if LAUNCHD
|
||||
launchagents_DATA = org.x.X11.plist
|
||||
launchagents_PRE = org.x.X11.plist.pre
|
||||
launchagents_DATA = $(launchagents_PRE:plist.pre=plist)
|
||||
|
||||
CPP_FILES_FLAGS = -D__libexecdir__="${libexecdir}"
|
||||
|
||||
CLEANFILES = $(launchagents_DATA)
|
||||
|
||||
include $(top_srcdir)/cpprules.in
|
||||
endif
|
||||
|
||||
clean-local:
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
<string>org.x.X11</string>
|
||||
<key>ProgramArguments</key>
|
||||
<array>
|
||||
<string>/usr/X11/libexec/x11-exec</string>
|
||||
<string>__libexecdir__/x11-exec</string>
|
||||
<string>-launchd</string>
|
||||
</array>
|
||||
<key>Sockets</key>
|
Loading…
Reference in New Issue
Block a user