From: Carsten Schlote <c.schl...@konzeptpark.de>
Fixed install stage of mc to work with default
build frame work. Generation of docs is disabled
and files get installed to package dir.
Added options for VFS, Editor and ColorHighlighting
support.
Signed-off-by: Carsten Schlote <c.schl...@konzeptpark.de>
---
patches/mc-4.6.1/autogen.sh | 1 +
patches/mc-4.6.1/mc-install-fixes.patch | 54 ++++++++++++++++
patches/mc-4.6.1/series | 1 +
rules/mc.in | 22 ++++++-
rules/mc.make | 105 ++++++++++++++++++++++++++++++-
5 files changed, 179 insertions(+), 4 deletions(-)
create mode 120000 patches/mc-4.6.1/autogen.sh
create mode 100644 patches/mc-4.6.1/mc-install-fixes.patch
create mode 100644 patches/mc-4.6.1/series
diff --git a/patches/mc-4.6.1/autogen.sh b/patches/mc-4.6.1/autogen.sh
new file mode 120000
index 0000000..9f8a4cb
--- /dev/null
+++ b/patches/mc-4.6.1/autogen.sh
@@ -0,0 +1 @@
+../autogen.sh
\ No newline at end of file
diff --git a/patches/mc-4.6.1/mc-install-fixes.patch
b/patches/mc-4.6.1/mc-install-fixes.patch
new file mode 100644
index 0000000..2b1fd23
--- /dev/null
+++ b/patches/mc-4.6.1/mc-install-fixes.patch
@@ -0,0 +1,54 @@
+From: Carsten Schlote <schl...@vahanus.net>
+Subject: [patch] Disabled document creation in makefile
+
+The build system uses some tool with relative path prefix. So it breaks
+the build when installing into a different destdir.
+
+Doc creation removed.
+
+Signed-off-by: Carsten Schlote <schl...@vahanus.net>
+---
+ Makefile.am | 2 +-
+ configure.ac | 9 ---------
+ 2 files changed, 1 insertion(+), 10 deletions(-)
+
+Index: Makefile.am
+===================================================================
+--- Makefile.am.orig 2005-05-31 05:24:26.000000000 +0200
++++ Makefile.am 2009-03-19 12:22:44.000000000 +0100
+@@ -2,7 +2,7 @@
+
+ AUTOMAKE_OPTIONS = 1.5
+
+-SUBDIRS = intl po m4 vfs slang edit src lib doc syntax
++SUBDIRS = intl po m4 vfs slang edit src lib syntax
+
+ EXTRA_DIST = FAQ HACKING INSTALL.FAST MAINTAINERS README.QNX TODO
+
+Index: configure.ac
+===================================================================
+--- configure.ac.orig 2005-07-23 18:52:49.000000000 +0200
++++ configure.ac 2009-03-19 12:23:16.000000000 +0100
+@@ -598,7 +598,6 @@
+ mc.qpg
+ pkginfo
+ prototype
+-doc/Makefile
+ vfs/Makefile
+ vfs/extfs/Makefile
+ lib/Makefile
+@@ -629,14 +628,6 @@
+ vfs/extfs/uzip
+ vfs/extfs/uzoo
+
+-doc/mc.1 doc/mcedit.1 doc/mcview.1 doc/mcserv.8
+-doc/es/mc.1 doc/es/Makefile
+-doc/hu/mc.1 doc/hu/Makefile
+-doc/it/mc.1 doc/it/Makefile
+-doc/pl/mc.1 doc/pl/Makefile
+-doc/ru/mc.1 doc/ru/Makefile
+-doc/sr/mc.1 doc/sr/mcserv.8 doc/sr/Makefile
+-
+ intl/Makefile
+ po/Makefile.in
+ ])
diff --git a/patches/mc-4.6.1/series b/patches/mc-4.6.1/series
new file mode 100644
index 0000000..b3c3e84
--- /dev/null
+++ b/patches/mc-4.6.1/series
@@ -0,0 +1 @@
+mc-install-fixes.patch -p0
diff --git a/rules/mc.in b/rules/mc.in
index bbf024d..c9ac735 100644
--- a/rules/mc.in
+++ b/rules/mc.in
@@ -10,13 +10,13 @@ menuconfig MC
help
midnight commander is a text oriented file manager
+if MC
+
comment "build options ---"
- depends on MC
choice
prompt "Kind of MMI "
default MC_USES_NO_PREFERENCE
- depends on MC
config MC_USES_NO_PREFERENCE
bool "no preference"
@@ -34,3 +34,21 @@ config MC_USES_SLANG
Build midnight commander with slang
endchoice
+
+config MC_HAS_VFS
+ bool "Enable vfs support"
+ help
+ Enable VFS filesystem support
+
+config MC_HAS_EDIT
+ bool "Enable editor support"
+ help
+ Enable built-in editor
+
+config MC_USES_SYNTAX_HIGHLIGHTING
+ bool "Use syntax highlighting"
+ help
+ Copy syntax higlighting files
+
+endif
+
diff --git a/rules/mc.make b/rules/mc.make
index 5875c92..f62c819 100644
--- a/rules/mc.make
+++ b/rules/mc.make
@@ -2,6 +2,7 @@
#
# Copyright (C) 2006 by Sascha Hauer
# 2009 by Marc Kleine-Budde <m...@pengutronix.de>
+# 2010 by Carsten Schlote <c.schl...@konzeptpark.de>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -45,6 +46,7 @@ MC_ENV := $(CROSS_ENV)
#
MC_AUTOCONF := \
$(CROSS_AUTOCONF_USR) \
+ --with-charset=yes \
--with-x=no \
--without-gpm-mouse \
--disable-rpath
@@ -57,7 +59,13 @@ ifdef PTXCONF_MC_USES_SLANG
MC_AUTOCONF += --with-screen=slang
endif
-MC_INSTALL_OPT := -C src install
+ifdef PTXCONF_MC_HAS_VFS
+MC_AUTOCONF += --with-vfs=yes
+endif
+
+ifdef PTXCONF_MC_HAS_EDIT
+MC_AUTOCONF += --with-edit=yes
+endif
# ----------------------------------------------------------------------------
# Target-Install
@@ -71,12 +79,105 @@ $(STATEDIR)/mc.targetinstall:
@$(call install_fixup,mc,PRIORITY,optional)
@$(call install_fixup,mc,VERSION,$(MC_VERSION))
@$(call install_fixup,mc,SECTION,base)
- @$(call install_fixup,mc,AUTHOR,"Robert Schwebel
<r.schwe...@pengutronix.de>")
+ @$(call install_fixup,mc,AUTHOR,"Carsten Schlote
<c.schl...@konzeptpark.de>")
@$(call install_fixup,mc,DEPENDS,)
@$(call install_fixup,mc,DESCRIPTION,missing)
+ @$(call install_copy, mc, 0, 0, 0755, -,
/usr/share/mc/bin/mc-wrapper.csh)
+ @$(call install_copy, mc, 0, 0, 0755, -,
/usr/share/mc/bin/mc-wrapper.sh)
+ @$(call install_copy, mc, 0, 0, 0755, -, /usr/share/mc/bin/mc.csh)
+ @$(call install_copy, mc, 0, 0, 0755, -, /usr/share/mc/bin/mc.sh)
+
+ @$(call install_copy, mc, 0, 0, 0644, -, /usr/share/mc/extfs/README)
+ @$(call install_copy, mc, 0, 0, 0755, -, /usr/share/mc/extfs/a)
+ @$(call install_copy, mc, 0, 0, 0755, -, /usr/share/mc/extfs/apt)
+ @$(call install_copy, mc, 0, 0, 0755, -, /usr/share/mc/extfs/audio)
+ @$(call install_copy, mc, 0, 0, 0755, -, /usr/share/mc/extfs/bpp)
+ @$(call install_copy, mc, 0, 0, 0755, -, /usr/share/mc/extfs/deb)
+ @$(call install_copy, mc, 0, 0, 0755, -, /usr/share/mc/extfs/deba)
+ @$(call install_copy, mc, 0, 0, 0755, -, /usr/share/mc/extfs/debd)
+ @$(call install_copy, mc, 0, 0, 0755, -, /usr/share/mc/extfs/dpkg)
+ @$(call install_copy, mc, 0, 0, 0644, -, /usr/share/mc/extfs/extfs.ini)
+ @$(call install_copy, mc, 0, 0, 0755, -, /usr/share/mc/extfs/hp48)
+ @$(call install_copy, mc, 0, 0, 0755, -, /usr/share/mc/extfs/iso9660)
+ @$(call install_copy, mc, 0, 0, 0755, -, /usr/share/mc/extfs/lslR)
+ @$(call install_copy, mc, 0, 0, 0755, -, /usr/share/mc/extfs/mailfs)
+ @$(call install_copy, mc, 0, 0, 0755, -, /usr/share/mc/extfs/patchfs)
+ @$(call install_copy, mc, 0, 0, 0755, -, /usr/share/mc/extfs/rpm)
+ @$(call install_copy, mc, 0, 0, 0755, -, /usr/share/mc/extfs/rpms)
+ @$(call install_copy, mc, 0, 0, 0644, -, /usr/share/mc/extfs/sfs.ini)
+ @$(call install_copy, mc, 0, 0, 0755, -, /usr/share/mc/extfs/trpm)
+ @$(call install_copy, mc, 0, 0, 0755, -, /usr/share/mc/extfs/uar)
+ @$(call install_copy, mc, 0, 0, 0755, -, /usr/share/mc/extfs/uarj)
+ @$(call install_copy, mc, 0, 0, 0755, -, /usr/share/mc/extfs/uha)
+ @$(call install_copy, mc, 0, 0, 0755, -, /usr/share/mc/extfs/ulha)
+ @$(call install_copy, mc, 0, 0, 0755, -, /usr/share/mc/extfs/urar)
+ @$(call install_copy, mc, 0, 0, 0755, -, /usr/share/mc/extfs/uzip)
+ @$(call install_copy, mc, 0, 0, 0755, -, /usr/share/mc/extfs/uzoo)
+
+ @$(call install_copy, mc, 0, 0, 0644, -, /usr/share/mc/cedit.menu)
+ @$(call install_copy, mc, 0, 0, 0644, -, /usr/share/mc/edit.indent.rc)
+ @$(call install_copy, mc, 0, 0, 0644, -, /usr/share/mc/edit.spell.rc)
+ @$(call install_copy, mc, 0, 0, 0644, -, /usr/share/mc/mc.hint)
+ @$(call install_copy, mc, 0, 0, 0644, -, /usr/share/mc/mc.lib)
+ @$(call install_copy, mc, 0, 0, 0644, -, /usr/share/mc/mc.menu)
+ @$(call install_copy, mc, 0, 0, 0644, -, /usr/share/mc/mc.ext)
+
+ ifdef PTXCONF_MC_USES_SYNTAX_HIGHLIGHTING
+ @$(call install_copy, mc, 0, 0, 0644, $(MC_DIR)/syntax/Syntax
, /usr/share/mc/syntax/Syntax )
+ @$(call install_copy, mc, 0, 0, 0644, $(MC_DIR)/syntax/ada95.syntax
, /usr/share/mc/syntax/ada95.syntax )
+ @$(call install_copy, mc, 0, 0, 0644, $(MC_DIR)/syntax/aspx.syntax
, /usr/share/mc/syntax/aspx.syntax )
+ @$(call install_copy, mc, 0, 0, 0644, $(MC_DIR)/syntax/assembler.syntax
, /usr/share/mc/syntax/assembler.syntax )
+ @$(call install_copy, mc, 0, 0, 0644, $(MC_DIR)/syntax/c.syntax
, /usr/share/mc/syntax/c.syntax )
+ @$(call install_copy, mc, 0, 0, 0644, $(MC_DIR)/syntax/changelog.syntax
, /usr/share/mc/syntax/changelog.syntax )
+ @$(call install_copy, mc, 0, 0, 0644, $(MC_DIR)/syntax/cs.syntax
, /usr/share/mc/syntax/cs.syntax )
+ @$(call install_copy, mc, 0, 0, 0644, $(MC_DIR)/syntax/diff.syntax
, /usr/share/mc/syntax/diff.syntax )
+ @$(call install_copy, mc, 0, 0, 0644, $(MC_DIR)/syntax/dos.syntax
, /usr/share/mc/syntax/dos.syntax )
+ @$(call install_copy, mc, 0, 0, 0644, $(MC_DIR)/syntax/eiffel.syntax
, /usr/share/mc/syntax/eiffel.syntax )
+ @$(call install_copy, mc, 0, 0, 0644, $(MC_DIR)/syntax/fortran.syntax
, /usr/share/mc/syntax/fortran.syntax )
+ @$(call install_copy, mc, 0, 0, 0644, $(MC_DIR)/syntax/html.syntax
, /usr/share/mc/syntax/html.syntax )
+ @$(call install_copy, mc, 0, 0, 0644, $(MC_DIR)/syntax/idl.syntax
, /usr/share/mc/syntax/idl.syntax )
+ @$(call install_copy, mc, 0, 0, 0644, $(MC_DIR)/syntax/java.syntax
, /usr/share/mc/syntax/java.syntax )
+ @$(call install_copy, mc, 0, 0, 0644, $(MC_DIR)/syntax/js.syntax
, /usr/share/mc/syntax/js.syntax )
+ @$(call install_copy, mc, 0, 0, 0644, $(MC_DIR)/syntax/latex.syntax
, /usr/share/mc/syntax/latex.syntax )
+ @$(call install_copy, mc, 0, 0, 0644, $(MC_DIR)/syntax/lisp.syntax
, /usr/share/mc/syntax/lisp.syntax )
+ @$(call install_copy, mc, 0, 0, 0644, $(MC_DIR)/syntax/lsm.syntax
, /usr/share/mc/syntax/lsm.syntax )
+ @$(call install_copy, mc, 0, 0, 0644, $(MC_DIR)/syntax/lua.syntax
, /usr/share/mc/syntax/lua.syntax )
+ @$(call install_copy, mc, 0, 0, 0644, $(MC_DIR)/syntax/m4.syntax
, /usr/share/mc/syntax/m4.syntax )
+ @$(call install_copy, mc, 0, 0, 0644, $(MC_DIR)/syntax/mail.syntax
, /usr/share/mc/syntax/mail.syntax )
+ @$(call install_copy, mc, 0, 0, 0644, $(MC_DIR)/syntax/makefile.syntax
, /usr/share/mc/syntax/makefile.syntax )
+ @$(call install_copy, mc, 0, 0, 0644, $(MC_DIR)/syntax/ml.syntax
, /usr/share/mc/syntax/ml.syntax )
+ @$(call install_copy, mc, 0, 0, 0644, $(MC_DIR)/syntax/nroff.syntax
, /usr/share/mc/syntax/nroff.syntax )
+ @$(call install_copy, mc, 0, 0, 0644, $(MC_DIR)/syntax/octave.syntax
, /usr/share/mc/syntax/octave.syntax )
+ @$(call install_copy, mc, 0, 0, 0644, $(MC_DIR)/syntax/pascal.syntax
, /usr/share/mc/syntax/pascal.syntax )
+ @$(call install_copy, mc, 0, 0, 0644, $(MC_DIR)/syntax/perl.syntax
, /usr/share/mc/syntax/perl.syntax )
+ @$(call install_copy, mc, 0, 0, 0644, $(MC_DIR)/syntax/php.syntax
, /usr/share/mc/syntax/php.syntax )
+ @$(call install_copy, mc, 0, 0, 0644, $(MC_DIR)/syntax/po.syntax
, /usr/share/mc/syntax/po.syntax )
+ @$(call install_copy, mc, 0, 0, 0644, $(MC_DIR)/syntax/povray.syntax
, /usr/share/mc/syntax/povray.syntax )
+ @$(call install_copy, mc, 0, 0, 0644, $(MC_DIR)/syntax/python.syntax
, /usr/share/mc/syntax/python.syntax )
+ @$(call install_copy, mc, 0, 0, 0644, $(MC_DIR)/syntax/ruby.syntax
, /usr/share/mc/syntax/ruby.syntax )
+ @$(call install_copy, mc, 0, 0, 0644, $(MC_DIR)/syntax/sh.syntax
, /usr/share/mc/syntax/sh.syntax )
+ @$(call install_copy, mc, 0, 0, 0644, $(MC_DIR)/syntax/slang.syntax
, /usr/share/mc/syntax/slang.syntax )
+ @$(call install_copy, mc, 0, 0, 0644, $(MC_DIR)/syntax/smalltalk.syntax
, /usr/share/mc/syntax/smalltalk.syntax )
+ @$(call install_copy, mc, 0, 0, 0644, $(MC_DIR)/syntax/spec.syntax
, /usr/share/mc/syntax/spec.syntax )
+ @$(call install_copy, mc, 0, 0, 0644, $(MC_DIR)/syntax/sql.syntax
, /usr/share/mc/syntax/sql.syntax )
+ @$(call install_copy, mc, 0, 0, 0644, $(MC_DIR)/syntax/swig.syntax
, /usr/share/mc/syntax/swig.syntax )
+ @$(call install_copy, mc, 0, 0, 0644, $(MC_DIR)/syntax/syntax.syntax
, /usr/share/mc/syntax/syntax.syntax )
+ @$(call install_copy, mc, 0, 0, 0644, $(MC_DIR)/syntax/tcl.syntax
, /usr/share/mc/syntax/tcl.syntax )
+ @$(call install_copy, mc, 0, 0, 0644, $(MC_DIR)/syntax/texinfo.syntax
, /usr/share/mc/syntax/texinfo.syntax )
+ @$(call install_copy, mc, 0, 0, 0644, $(MC_DIR)/syntax/unknown.syntax
, /usr/share/mc/syntax/unknown.syntax )
+ @$(call install_copy, mc, 0, 0, 0644, $(MC_DIR)/syntax/xml.syntax
, /usr/share/mc/syntax/xml.syntax )
+ endif
+ @$(call install_copy, mc, 0, 0, 0755, -, /usr/lib/mc/cons.saver)
+
+ @$(call install_copy, mc, 0, 0, 0755, -, /usr/bin/mcmfmt)
@$(call install_copy, mc, 0, 0, 0755, -, /usr/bin/mc)
+ifdef PTXCONF_MC_HAS_EDIT
+ @$(call install_link, mc, mc, usr/bin/mcedit)
+endif
+ @$(call install_link, mc, mc, usr/bin/mcview)
+
@$(call install_finish,mc)
@$(call touch)
--
1.6.5.6.gb3118
--
ptxdist mailing list
ptxdist@pengutronix.de
