Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code

This commit is contained in:
Nicholas Marriott 2014-06-20 12:20:29 +01:00
commit 1544c688e6
2 changed files with 1 additions and 2 deletions

View File

@ -247,7 +247,7 @@ install-exec-hook:
sed -e "s|@SYSCONFDIR@|$(sysconfdir)|g" $(srcdir)/tmux.1| \ sed -e "s|@SYSCONFDIR@|$(sysconfdir)|g" $(srcdir)/tmux.1| \
$(AWK) -f$(srcdir)/mdoc2man.awk >$(srcdir)/tmux.1.man; \ $(AWK) -f$(srcdir)/mdoc2man.awk >$(srcdir)/tmux.1.man; \
fi fi
$(MKDIR_P) $(DESTDIR)$(mandir)/man1 $(mkdir_p) $(DESTDIR)$(mandir)/man1
$(INSTALL_DATA) $(srcdir)/tmux.1.@MANFORMAT@ \ $(INSTALL_DATA) $(srcdir)/tmux.1.@MANFORMAT@ \
$(DESTDIR)$(mandir)/man1/tmux.1 $(DESTDIR)$(mandir)/man1/tmux.1

View File

@ -16,7 +16,6 @@ AC_CANONICAL_HOST
# Set up the compiler in two different ways and say yes we may want to install. # Set up the compiler in two different ways and say yes we may want to install.
AC_PROG_CC AC_PROG_CC
AM_PROG_CC_C_O AM_PROG_CC_C_O
AC_PROG_MKDIR_P
AC_PROG_INSTALL AC_PROG_INSTALL
# Default tmux.conf goes in /etc not ${prefix}/etc. # Default tmux.conf goes in /etc not ${prefix}/etc.