diff options
| author | Jeremy Huddleston Sequoia <jeremyhu@apple.com> | 2015-12-29 17:03:43 -0800 |
|---|---|---|
| committer | Jeremy Huddleston Sequoia <jeremyhu@apple.com> | 2015-12-29 17:21:42 -0800 |
| commit | 72160c42bea2073bf95c01aca59a12f0ca7ab707 (patch) | |
| tree | c17eba5dafe77e9d92669220506f37601af1856e /launchd/user_startx | |
| parent | 281b314f38564537279c94e605bee74ff41b0245 (diff) | |
launchd: Install binaries into libexecdir
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Diffstat (limited to 'launchd/user_startx')
| -rw-r--r-- | launchd/user_startx/Makefile.am | 5 | ||||
| -rw-r--r-- | launchd/user_startx/startx.plist.cpp | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/launchd/user_startx/Makefile.am b/launchd/user_startx/Makefile.am index bf18fb0..e895ee2 100644 --- a/launchd/user_startx/Makefile.am +++ b/launchd/user_startx/Makefile.am @@ -21,9 +21,7 @@ include $(top_srcdir)/cpprules.in -xinitrcdir = $(XINITDIR) - -xinitrc_PROGRAMS = launchd_startx +libexec_PROGRAMS = launchd_startx AM_CPPFLAGS = -I$(srcdir)/.. -DXINITDIR=\"$(xinitrcdir)\" -DBINDIR=\"$(bindir)\" @@ -32,6 +30,7 @@ dist_launchd_startx_SOURCES = \ launchd_startx.c CPP_FILES_FLAGS = \ + -D__libexecdir__="$(libexecdir)" \ -D__xinitrcdir__="$(xinitrcdir)" \ -D__bindir__="$(bindir)" \ -DBUNDLE_ID_PREFIX="$(bundleidprefix)" diff --git a/launchd/user_startx/startx.plist.cpp b/launchd/user_startx/startx.plist.cpp index a43025f..f79d461 100644 --- a/launchd/user_startx/startx.plist.cpp +++ b/launchd/user_startx/startx.plist.cpp @@ -6,7 +6,7 @@ <string>BUNDLE_ID_PREFIX.startx</string> <key>ProgramArguments</key> <array> - <string>__xinitrcdir__/launchd_startx</string> + <string>__libexecdir__/launchd_startx</string> <string>__bindir__/startx</string> #ifdef LAUNCHAGENT_XSERVER_PATH <string>--</string> |