One more update.
So using the Debian-supplied lua will apparently not work, because
that lua is built with C, not with C++. This can apparently cause all
kind of issues with longjmps on exception handling. Since Debian
currently does not include a lua copy built with C++, it seems best to
just use the enigma-included lua.
Attached is a patch that should allow the documentation location to be
configured via configure via --docdir, defaulting to the location it
currently is at.
The second patch removes a broken and useless section from the man
page (see also)
The third patch fixes two spelling errors found by Debian lintian.
best regards,
Erich Schubert
Index: doc/reference/images/Makefile.am
===================================================================
--- doc/reference/images/Makefile.am (Revision 1900)
+++ doc/reference/images/Makefile.am (Arbeitskopie)
@@ -340,7 +340,7 @@
PNGLIST = $(SIMPLEPNG) $(FRAMABLEFLOORS) $(FRAMEDFLOORS) $(LASERS) $(THIEVES)
-pngdir = @datadir@/doc/enigma/reference/images
+pngdir = @docdir@/reference/images
png_DATA = $(PNG) $(PNGLIST)
all: $(PNGLIST)
Index: doc/reference/Makefile.am
===================================================================
--- doc/reference/Makefile.am (Revision 1900)
+++ doc/reference/Makefile.am (Arbeitskopie)
@@ -4,7 +4,7 @@
HTML = enigma-ref.html
-refd...@datadir@/doc/enigma/reference
+refd...@docdir@/reference
ref_DATA = $(HTML) ant_lua.txt sounds.txt soundset.lua lua2xml xml2lua
EXTRA_DIST = enigma-ref.texi enigma-t2h.init level_api_syntax.tex level_api_constants.tex level_api_syntax_examples.tex level_api_tds.tex $(ref_DATA)
Index: doc/images/flags25x15/Makefile.am
===================================================================
--- doc/images/flags25x15/Makefile.am (Revision 1900)
+++ doc/images/flags25x15/Makefile.am (Arbeitskopie)
@@ -1,6 +1,6 @@
PNG = $(wildcard $(srcdir)/*.png)
-pngd...@datadir@/doc/enigma/images/flags25x15
+pngd...@docdir@/images/flags25x15
png_DATA=$(PNG)
EXTRA_DIST = $(png_DATA)
Index: doc/images/Makefile.am
===================================================================
--- doc/images/Makefile.am (Revision 1900)
+++ doc/images/Makefile.am (Arbeitskopie)
@@ -1,6 +1,6 @@
SUBDIRS = flags25x15
-pngd...@datadir@/doc/enigma/images
+pngd...@docdir@/images
png_DATA= enigma.css menu_bg.jpg nav_enigma.gif nav_cornerul.gif nav_cornerur.gif favicon.png
Index: doc/Makefile.am
===================================================================
--- doc/Makefile.am (Revision 1900)
+++ doc/Makefile.am (Arbeitskopie)
@@ -2,10 +2,10 @@
man_MANS = enigma.6
-indexd...@datadir@/doc/enigma
+indexd...@docdir@
index_DATA = index.html
-docdir = @datadir@/doc/enigma
+docdir = @docdir@
doc_DATA = gpl.txt lgpl.txt
EXTRA_DIST = gpl.txt lgpl.txt enigma.6 HACKING README.mingw32 REQUIREMENTS README.macosx\
Index: doc/manual/images/Makefile.am
===================================================================
--- doc/manual/images/Makefile.am (Revision 1900)
+++ doc/manual/images/Makefile.am (Arbeitskopie)
@@ -1,6 +1,6 @@
PNG = $(wildcard $(srcdir)/*.png)
-pngd...@datadir@/doc/enigma/manual/images
+pngd...@docdir@/manual/images
png_DATA=$(PNG)
EXTRA_DIST = $(PNG)
Index: doc/manual/Makefile.am
===================================================================
--- doc/manual/Makefile.am (Revision 1900)
+++ doc/manual/Makefile.am (Arbeitskopie)
@@ -6,7 +6,7 @@
HTML = $(addprefix $(if $(builddir), $(builddir)/,), $(addsuffix .html, $(basename $(notdir $(TEXI)))))
-htmld...@datadir@/doc/enigma/manual
+htmld...@docdir@/manual
html_DATA = $(HTML)
EXTRA_DIST = $(TEXI) $(html_DATA)
@@ -30,4 +30,4 @@
pdf: enigma.pdf enigma_de.pdf enigma_fr.pdf
%.pdf: %.texi
- texi2dvi --pdf $<
\ No newline at end of file
+ texi2dvi --pdf $<
Index: doc/enigma.6
===================================================================
--- doc/enigma.6 (Revision 1900)
+++ doc/enigma.6 (Arbeitskopie)
@@ -89,9 +89,6 @@
.B F1
to get online help in nearly all menus.
.
-.\SH SEE ALSO
-.\Other related Manpages? I don't think there are any :)
-.
.SH AUTHORS
.
Daniel Heck <dh...@gmx.de> is the main author
Index: src/world.cc
===================================================================
--- src/world.cc (Revision 1900)
+++ src/world.cc (Arbeitskopie)
@@ -2530,13 +2530,13 @@
Object *obj = NULL;
if (last_templ)
obj = last_templ->clone();
- ASSERT(obj != NULL, XLevelRuntime, ecl::strf("MakeObject: unkown object name `%s'\n",kind).c_str());
+ ASSERT(obj != NULL, XLevelRuntime, ecl::strf("MakeObject: unknown object name `%s'\n",kind).c_str());
return obj;
}
Object * GetObjectTemplate(const std::string &kind) {
if (!repos->has_templ(kind)) {
- cerr << "GetObjectTemplate: unkown object name `" <<kind<< "'.\n";
+ cerr << "GetObjectTemplate: unknown object name `" <<kind<< "'.\n";
return 0;
} else
return repos->get_template(kind);
Index: src/main.cc
===================================================================
--- src/main.cc (Revision 1900)
+++ src/main.cc (Arbeitskopie)
@@ -516,7 +516,7 @@
else {
versionInfo = "v" PACKAGE_VERSION
" (development version - v" +
- ecl::strf("%.2f",ENIGMACOMPATIBITLITY) + " compatibilty branch)";
+ ecl::strf("%.2f",ENIGMACOMPATIBITLITY) + " compatibility branch)";
}
return versionInfo;
}
_______________________________________________
Enigma-devel mailing list
Enigma-devel@nongnu.org
http://lists.nongnu.org/mailman/listinfo/enigma-devel
