circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-04 15:26:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into sixel

Browse Source
This commit is contained in:
Nicholas Marriott
2019-12-10 16:34:11 +00:00
parent cf071ffecd 15d7e564dd
commit 1a0e5fe933
3 changed files with 54 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -11,7 +11,8 @@ EXTRA_DIST = \
dist_EXTRA_tmux_SOURCES = compat/*.[ch]
# Preprocessor flags.
AM_CPPFLAGS += @XOPEN_DEFINES@ -DTMUX_CONF="\"$(sysconfdir)/tmux.conf\""
AM_CPPFLAGS += @XOPEN_DEFINES@
AM_CPPFLAGS += -DTMUX_CONF="\"$(sysconfdir)/tmux.conf:~/.tmux.conf:~/.config/tmux/tmux.conf\""
# Additional object files.
LDADD = $(LIBOBJS)