mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-03 10:04:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Install help files into /usr/share/mc/help instead of /usr/share/mc.

Browse Source 
Optimisation of language-specific help file creating.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2010-09-16 14:40:09 +04:00
parent 280194ec15
commit 185d5fc359
10 changed files with 21 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/hlp/Makefile.am
View File

@ -1,10 +1,11 @@
DIST_SUBDIRS = es hu it pl ru sr DIST_SUBDIRS = es hu it pl ru sr
SUBDIRS = $(DOC_LINGUAS) SUBDIRS = $(DOC_LINGUAS)
pkgdata_DATA = mc.hlp hlpdir = $(pkgdatadir)/help
hlp_DATA = mc.hlp
EXTRA_DIST = xnc.hlp EXTRA_DIST = xnc.hlp
CLEANFILES = $(pkgdata_DATA) CLEANFILES = $(hlp_DATA)
mc.hlp: $(top_builddir)/doc/man/mc.1 $(srcdir)/xnc.hlp $(top_builddir)/src/man2hlp/man2hlp mc.hlp: $(top_builddir)/doc/man/mc.1 $(srcdir)/xnc.hlp $(top_builddir)/src/man2hlp/man2hlp
- $(top_builddir)/src/man2hlp/man2hlp $(top_builddir)/doc/man/mc.1 $(srcdir)/xnc.hlp mc.hlp - $(top_builddir)/src/man2hlp/man2hlp $(top_builddir)/doc/man/mc.1 $(srcdir)/xnc.hlp mc.hlp

8
doc/hlp/es/Makefile.am
View File

@ -1,9 +1,3 @@
HLP_LANG=es HLP_LANG=es
MAN2HLP=$(top_builddir)/src/man2hlp/man2hlp
pkgdata_DATA = mc.hlp.$(HLP_LANG)
EXTRA_DIST = xnc.hlp include ../hlp-lang-include.am
CLEANFILES = $(pkgdata_DATA)
mc.hlp.$(HLP_LANG): $(top_builddir)/doc/man/$(HLP_LANG)/mc.1 $(srcdir)/xnc.hlp $(MAN2HLP)
- $(MAN2HLP) $(top_builddir)/doc/man/$(HLP_LANG)/mc.1 $(srcdir)/xnc.hlp mc.hlp.$(HLP_LANG)

10
doc/hlp/hlp-lang-include.am Normal file
View File

@ -0,0 +1,10 @@
MAN2HLP=$(top_builddir)/src/man2hlp/man2hlp
hlpdir = $(pkgdatadir)/help
hlp_DATA = mc.hlp.$(HLP_LANG)
EXTRA_DIST = xnc.hlp
CLEANFILES = $(hlp_DATA)
mc.hlp.$(HLP_LANG): $(top_builddir)/doc/man/$(HLP_LANG)/mc.1 $(srcdir)/xnc.hlp $(MAN2HLP)
- $(MAN2HLP) $(top_builddir)/doc/man/$(HLP_LANG)/mc.1 $(srcdir)/xnc.hlp mc.hlp.$(HLP_LANG)

8
doc/hlp/hu/Makefile.am
View File

@ -1,9 +1,3 @@
HLP_LANG=hu HLP_LANG=hu
MAN2HLP=$(top_builddir)/src/man2hlp/man2hlp
pkgdata_DATA = mc.hlp.$(HLP_LANG)
EXTRA_DIST = xnc.hlp include ../hlp-lang-include.am
CLEANFILES = $(pkgdata_DATA)
mc.hlp.$(HLP_LANG): $(top_builddir)/doc/man/$(HLP_LANG)/mc.1 $(srcdir)/xnc.hlp $(MAN2HLP)
- $(MAN2HLP) $(top_builddir)/doc/man/$(HLP_LANG)/mc.1 $(srcdir)/xnc.hlp mc.hlp.$(HLP_LANG)

8
doc/hlp/it/Makefile.am
View File

@ -1,9 +1,3 @@
HLP_LANG=it HLP_LANG=it
MAN2HLP=$(top_builddir)/src/man2hlp/man2hlp
pkgdata_DATA = mc.hlp.$(HLP_LANG)
EXTRA_DIST = xnc.hlp include ../hlp-lang-include.am
CLEANFILES = $(pkgdata_DATA)
mc.hlp.$(HLP_LANG): $(top_builddir)/doc/man/$(HLP_LANG)/mc.1 $(srcdir)/xnc.hlp $(MAN2HLP)
- $(MAN2HLP) $(top_builddir)/doc/man/$(HLP_LANG)/mc.1 $(srcdir)/xnc.hlp mc.hlp.$(HLP_LANG)

8
doc/hlp/pl/Makefile.am
View File

@ -1,9 +1,3 @@
HLP_LANG=pl HLP_LANG=pl
MAN2HLP=$(top_builddir)/src/man2hlp/man2hlp
pkgdata_DATA = mc.hlp.$(HLP_LANG)
EXTRA_DIST = xnc.hlp include ../hlp-lang-include.am
CLEANFILES = $(pkgdata_DATA)
mc.hlp.$(HLP_LANG): $(top_builddir)/doc/man/$(HLP_LANG)/mc.1 $(srcdir)/xnc.hlp $(MAN2HLP)
- $(MAN2HLP) $(top_builddir)/doc/man/$(HLP_LANG)/mc.1 $(srcdir)/xnc.hlp mc.hlp.$(HLP_LANG)

8
doc/hlp/ru/Makefile.am
View File

@ -1,9 +1,3 @@
HLP_LANG=ru HLP_LANG=ru
MAN2HLP=$(top_builddir)/src/man2hlp/man2hlp
pkgdata_DATA = mc.hlp.$(HLP_LANG)
EXTRA_DIST = xnc.hlp include ../hlp-lang-include.am
CLEANFILES = $(pkgdata_DATA)
mc.hlp.$(HLP_LANG): $(top_builddir)/doc/man/$(HLP_LANG)/mc.1 $(srcdir)/xnc.hlp $(MAN2HLP)
- $(MAN2HLP) $(top_builddir)/doc/man/$(HLP_LANG)/mc.1 $(srcdir)/xnc.hlp mc.hlp.$(HLP_LANG)

8
doc/hlp/sr/Makefile.am
View File

@ -1,9 +1,3 @@
HLP_LANG=sr HLP_LANG=sr
MAN2HLP=$(top_builddir)/src/man2hlp/man2hlp
pkgdata_DATA = mc.hlp.$(HLP_LANG)
EXTRA_DIST = xnc.hlp include ../hlp-lang-include.am
CLEANFILES = $(pkgdata_DATA)
mc.hlp.$(HLP_LANG): $(top_builddir)/doc/man/$(HLP_LANG)/mc.1 $(srcdir)/xnc.hlp $(MAN2HLP)
- $(MAN2HLP) $(top_builddir)/doc/man/$(HLP_LANG)/mc.1 $(srcdir)/xnc.hlp mc.hlp.$(HLP_LANG)

1
lib/fileloc.h
View File

@ -25,6 +25,7 @@
#define MC_GLOBAL_MENU "mc.menu" #define MC_GLOBAL_MENU "mc.menu"
#define MC_LOCAL_MENU ".mc.menu" #define MC_LOCAL_MENU ".mc.menu"
#define MC_HINT "hints" PATH_SEP_STR "mc.hint" #define MC_HINT "hints" PATH_SEP_STR "mc.hint"
#define MC_HELP "help" PATH_SEP_STR "mc.hlp"
#define GLOBAL_KEYMAP_FILE "mc.keymap" #define GLOBAL_KEYMAP_FILE "mc.keymap"
#define CHARSETS_LIST "mc.charsets" #define CHARSETS_LIST "mc.charsets"
#define MC_LIB_EXT "mc.ext" #define MC_LIB_EXT "mc.ext"

2
src/help.c
View File

@ -966,7 +966,7 @@ interactive_display (const char *filename, const char *node)
if (filename != NULL) if (filename != NULL)
filedata = load_file (filename); filedata = load_file (filename);
else else
filedata = load_mc_home_file (mc_home_alt, "mc.hlp", &hlpfile); filedata = load_mc_home_file (mc_home_alt, MC_HELP, &hlpfile);
if (filedata == NULL) if (filedata == NULL)
message (D_ERROR, MSG_ERROR, _("Cannot open file %s\n%s"), message (D_ERROR, MSG_ERROR, _("Cannot open file %s\n%s"),