diff options
author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-06-25 09:49:14 +0100 |
---|---|---|
committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-06-25 09:49:14 +0100 |
commit | 18989cd430d9c23e2bdc4455213421a8ee104d2c (patch) | |
tree | 6a988c3e41ceb45bbbfc855417367ea23b6f98ea | |
parent | 828145456c4c1ab8340c2a38ee7e66333cff1d27 (diff) | |
parent | 097a046e4a2e4e637a53cfc85efca1c4268242c2 (diff) | |
download | rtmux-18989cd430d9c23e2bdc4455213421a8ee104d2c.tar.gz rtmux-18989cd430d9c23e2bdc4455213421a8ee104d2c.tar.bz2 rtmux-18989cd430d9c23e2bdc4455213421a8ee104d2c.zip |
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
-rw-r--r-- | Makefile.am | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 84261d41..fb707df0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,7 +6,7 @@ CLEANFILES = tmux.1.mdoc tmux.1.man # Distribution tarball options. EXTRA_DIST = \ - CHANGES FAQ README TODO examples compat \ + CHANGES FAQ README TODO COPYING examples compat \ array.h compat.h tmux.h osdep-*.c mdoc2man.awk tmux.1 dist-hook: grep "^#found_debug=" configure @@ -48,8 +48,12 @@ endif # Set flags for Solaris. if IS_SUNOS +if IS_GCC +CPPFLAGS += -D_XPG6 -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS +else CPPFLAGS += -D_XPG4_2 -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS endif +endif # Set flags for Sun CC. if IS_SUNCC |