The branch, master has been updated
via 907ad00300506c25ee84223811e25a411dc21517 (commit)
via 5b1cf02f2ea224922661495af32d46b024e28eef (commit)
from fce095665c62eb38826f42ae55a0fbe998f18be0 (commit)
- Log -----------------------------------------------------------------
commit 907ad00300506c25ee84223811e25a411dc21517
Merge: 5b1cf02 fce0956
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Commit: Nicholas Marriott <nicholas.marri...@gmail.com>
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Conflicts:
Makefile.am
Makefile.am | 11 +++++++----
client.c | 4 ++--
cmd-choose-tree.c | 10 +++++-----
configure.ac | 3 +++
format.c | 6 +++---
job.c | 4 ++--
server-client.c | 8 +++++---
server-fn.c | 1 +
server.c | 8 ++++----
tmux.1 | 6 +++---
tmux.c | 2 +-
tmux.h | 6 ++----
window-choose.c | 14 +++++++++++---
13 files changed, 49 insertions(+), 34 deletions(-)
diff --cc Makefile.am
index c746b3d,3eb3190..84261d4
--- a/Makefile.am
+++ b/Makefile.am
@@@ -235,15 -237,15 +235,18 @@@ if NO_CFMAKERA
nodist_tmux_SOURCES += compat/cfmakeraw.c
endif
-# Build tmux.1 in the right format.
-tmux.1: tmux.1.in
+# Install tmux.1 in the right format.
+install-exec-hook:
if test x@MANFORMAT@ = xmdoc; then \
- cp tmux.1 tmux.1.mdoc; \
- sed -e "s|@SYSCONFDIR@|$(sysconfdir)|g" $(srcdir)/tmux.1.in \
- >$(srcdir)/tmux.1; \
++ sed -e "s|@SYSCONFDIR@|$(sysconfdir)|g" $(srcdir)/tmux.1 \
++ >$(srcdir)/tmux.1.mdoc; \
else \
- $(AWK) -fmdoc2man.awk <tmux.1 >tmux.1.man; \
- sed -e "s|@SYSCONFDIR@|$(sysconfdir)|g" $(srcdir)/tmux.1.in| \
- $(AWK) -fmdoc2man.awk >$(srcdir)/tmux.1; \
++ sed -e "s|@SYSCONFDIR@|$(sysconfdir)|g" $(srcdir)/tmux.1| \
++ $(AWK) -fmdoc2man.awk >$(srcdir)/tmux.1.man; \
fi
+ $(MKDIR_P) $(DESTDIR)$(mandir)/man1
- $(INSTALL_DATA) tmux.1.@MANFORMAT@ $(DESTDIR)$(mandir)/man1/tmux.1
++ $(INSTALL_DATA) $(srcdir)/tmux.1.@MANFORMAT@ \
++ $(DESTDIR)$(mandir)/man1/tmux.1
# Update SF web site.
upload-index.html: update-index.html
commit 5b1cf02f2ea224922661495af32d46b024e28eef
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Commit: Nicholas Marriott <nicholas.marri...@gmail.com>
Rename tmux.1.in back to tmux.1 and generate tmux.1.{mdoc,man} instead.
---
Makefile.am | 16 ++++++++--------
tmux.1.in => tmux.1 | 0
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index c131940..c746b3d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,14 +2,12 @@
# Obvious program stuff.
bin_PROGRAMS = tmux
-nodist_man1_MANS = tmux.1
-CLEANFILES = tmux.1
+CLEANFILES = tmux.1.mdoc tmux.1.man
# Distribution tarball options.
EXTRA_DIST = \
CHANGES FAQ README TODO examples compat \
- array.h compat.h tmux.h osdep-*.c mdoc2man.awk \
- tmux.1.in
+ array.h compat.h tmux.h osdep-*.c mdoc2man.awk tmux.1
dist-hook:
grep "^#found_debug=" configure
find $(distdir) -name .svn -type d|xargs rm -Rf
@@ -237,13 +235,15 @@ if NO_CFMAKERAW
nodist_tmux_SOURCES += compat/cfmakeraw.c
endif
-# Build tmux.1 in the right format.
-tmux.1: tmux.1.in
+# Install tmux.1 in the right format.
+install-exec-hook:
if test x@MANFORMAT@ = xmdoc; then \
- cp tmux.1.in tmux.1; \
+ cp tmux.1 tmux.1.mdoc; \
else \
- $(AWK) -fmdoc2man.awk <tmux.1.in >tmux.1; \
+ $(AWK) -fmdoc2man.awk <tmux.1 >tmux.1.man; \
fi
+ $(MKDIR_P) $(DESTDIR)$(mandir)/man1
+ $(INSTALL_DATA) tmux.1.@MANFORMAT@ $(DESTDIR)$(mandir)/man1/tmux.1
# Update SF web site.
upload-index.html: update-index.html
diff --git a/tmux.1.in b/tmux.1
similarity index 100%
rename from tmux.1.in
rename to tmux.1
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 21 +++++++++++----------
tmux.1.in => tmux.1 | 0
2 files changed, 11 insertions(+), 10 deletions(-)
rename tmux.1.in => tmux.1 (100%)
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
AlienVault Unified Security Management (USM) platform delivers complete
security visibility with the essential security capabilities. Easily and
efficiently configure, manage, and operate all of your security controls
from a single console and one unified framework. Download a free trial.
http://p.sf.net/sfu/alienvault_d2d
_______________________________________________
tmux-cvs mailing list
tmux-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
