From 289959792ebc512daac021e94550d8212c034f3e Mon Sep 17 00:00:00 2001 From: Slava Zanko Date: Fri, 22 May 2009 12:19:16 +0300 Subject: [PATCH] scripts mc.sh, mc.csh, mc-wrapper.csh and mc-wrapper.sh now install into %{libexec}/mc directory --- contrib/Makefile.am | 9 ++++----- contrib/mc.csh.in | 2 +- contrib/mc.sh.in | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 1fb63dfe0..fe60844cc 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -2,8 +2,6 @@ SUBDIRS = dist -suppbindir = $(pkgdatadir)/bin - if CHARSET LIBFILES_ADD = mc.charsets else @@ -15,7 +13,8 @@ noinst_DATA = README.xterm mcserv.init mcserv.pamd SCRIPTS_IN = mc.csh.in mc.sh.in mc-wrapper.csh.in mc-wrapper.sh.in SCRIPTS_OUT = mc.csh mc.sh mc-wrapper.csh mc-wrapper.sh -suppbin_SCRIPTS = $(SCRIPTS_OUT) +pkglibexec_SCRIPTS = $(SCRIPTS_OUT) +pkglibexecdir = $(libexecdir)/@PACKAGE@ cfgdir = $(sysconfdir)/@PACKAGE@ cfg_DATA = \ @@ -30,10 +29,10 @@ EXTRA_DIST = \ $(cfg_DATA) mc.csh: $(srcdir)/mc.csh.in - sed "s%@""suppbindir@%$(suppbindir)%" $(srcdir)/mc.csh.in > mc.csh + sed "s%@""pkglibexecdir@%$(pkglibexecdir)%" $(srcdir)/mc.csh.in > mc.csh mc.sh: $(srcdir)/mc.sh.in - sed "s%@""suppbindir@%$(suppbindir)%" $(srcdir)/mc.sh.in > mc.sh + sed "s%@""pkglibexecdir@%$(pkglibexecdir)%" $(srcdir)/mc.sh.in > mc.sh mc-wrapper.csh: $(srcdir)/mc-wrapper.csh.in sed "s%@""bindir@%$(bindir)%" $(srcdir)/mc-wrapper.csh.in > mc-wrapper.csh diff --git a/contrib/mc.csh.in b/contrib/mc.csh.in index 8cc7db856..fc9350138 100644 --- a/contrib/mc.csh.in +++ b/contrib/mc.csh.in @@ -1 +1 @@ -alias mc 'source @suppbindir@/mc-wrapper.csh' +alias mc 'source @pkglibexecdir@/mc-wrapper.csh' diff --git a/contrib/mc.sh.in b/contrib/mc.sh.in index a829bf010..8b0ead8ed 100644 --- a/contrib/mc.sh.in +++ b/contrib/mc.sh.in @@ -1,3 +1,3 @@ # Don't define aliases in plain Bourne shell [ -n "${BASH_VERSION}${KSH_VERSION}${ZSH_VERSION}" ] || return 0 -alias mc='. @suppbindir@/mc-wrapper.sh' +alias mc='. @pkglibexecdir@/mc-wrapper.sh'