- Fix wrapper script for sh, change Makefile to substitute
datadir (bnc#639044). - Update to 4.7.0.9. Changes since 4.7.0.7: * Translation updates. * Added Galician translation. * Fix potential division by zero in Info panel. * Regexp replace only transforms the first occurence correctly. * Fix remaining plain int types in VFS. * Add "Toggle syntax highlighting" menu item. * Fix restoring of signals even if fork() fails. * Fix Segfault in replacement confirmation in editor. OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=19
This commit is contained in:
committed by
Git OBS Bridge
parent
04a5035312
commit
6a9c96f937
@@ -1,16 +1,33 @@
|
||||
Index: contrib/mc.sh.in
|
||||
===================================================================
|
||||
--- contrib/mc.sh.in.orig 2010-07-05 21:12:51.000000000 +0200
|
||||
+++ contrib/mc.sh.in 2010-07-06 19:10:33.155018811 +0200
|
||||
+++ contrib/mc.sh.in 2010-09-14 12:43:40.906036450 +0200
|
||||
@@ -1,3 +1,10 @@
|
||||
# Don't define aliases in plain Bourne shell
|
||||
[ -n "${BASH_VERSION}${KSH_VERSION}${ZSH_VERSION}" ] || return 0
|
||||
-alias mc='. @pkglibexecdir@/mc-wrapper.sh'
|
||||
+mc()
|
||||
+{
|
||||
+. @datadir@/mc/mc-wrapper.sh'
|
||||
+. @datadir@/mc/mc-wrapper.sh
|
||||
+}
|
||||
+if [ -n "$BASH_VERSION" ]
|
||||
+then
|
||||
+ export -f mc
|
||||
+fi
|
||||
Index: contrib/Makefile.am
|
||||
===================================================================
|
||||
--- contrib/Makefile.am.orig 2010-09-14 12:43:45.000000000 +0200
|
||||
+++ contrib/Makefile.am 2010-09-14 12:47:16.291629539 +0200
|
||||
@@ -22,10 +22,10 @@ EXTRA_DIST = \
|
||||
$(noinst_DATA)
|
||||
|
||||
mc.csh: $(srcdir)/mc.csh.in
|
||||
- sed "s%@""pkglibexecdir@%$(pkglibexecdir)%" $(srcdir)/mc.csh.in > mc.csh
|
||||
+ sed "s%@""datadir@%$(datadir)%" $(srcdir)/mc.csh.in > mc.csh
|
||||
|
||||
mc.sh: $(srcdir)/mc.sh.in
|
||||
- sed "s%@""pkglibexecdir@%$(pkglibexecdir)%" $(srcdir)/mc.sh.in > mc.sh
|
||||
+ sed -e "s%@""datadir@%$(datadir)%" $(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
|
||||
|
Reference in New Issue
Block a user