diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2014-06-20 12:20:29 +0100 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2014-06-20 12:20:29 +0100 |
| commit | 1544c688e6bdc61fec8a96588b2552551753e46b (patch) | |
| tree | 5da8c21c4b8670430d918c812af60d37454977cc | |
| parent | 8049baf0bda9dcdd4134b32a29cc2731dfa7900c (diff) | |
| parent | 19cb0a1a921164acb9591d7837d066ca9ea94a98 (diff) | |
| download | rtmux-1544c688e6bdc61fec8a96588b2552551753e46b.tar.gz rtmux-1544c688e6bdc61fec8a96588b2552551753e46b.tar.bz2 rtmux-1544c688e6bdc61fec8a96588b2552551753e46b.zip | |
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 5f9e0116..5f622acb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -247,7 +247,7 @@ install-exec-hook: sed -e "s|@SYSCONFDIR@|$(sysconfdir)|g" $(srcdir)/tmux.1| \ $(AWK) -f$(srcdir)/mdoc2man.awk >$(srcdir)/tmux.1.man; \ fi - $(MKDIR_P) $(DESTDIR)$(mandir)/man1 + $(mkdir_p) $(DESTDIR)$(mandir)/man1 $(INSTALL_DATA) $(srcdir)/tmux.1.@MANFORMAT@ \ $(DESTDIR)$(mandir)/man1/tmux.1 diff --git a/configure.ac b/configure.ac index 7cc1ac5d..a81ecc42 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,6 @@ AC_CANONICAL_HOST # Set up the compiler in two different ways and say yes we may want to install. AC_PROG_CC AM_PROG_CC_C_O -AC_PROG_MKDIR_P AC_PROG_INSTALL # Default tmux.conf goes in /etc not ${prefix}/etc. |