[ Thread Index |
Date Index
| More lists.liballeg.org/allegro-developers Archives
]
On Sun, 2006-03-19 at 00:13 +0100, Elias Pschernig wrote:
>
> > Maybe we should start installing modules in /usr/lib/allegro/4.2.x
> > instead of /usr/lib/allegro/4.2 ?
>
> Hm, yes, if we keep the patch for 4.2.1, we should do that. So the 4.2.1
> lib looks for modules in /usr/lib/allegro/4.2.1/ - and won't crash if
> there's 4.2.0 modules in /usr/lib/allegro/4.2.
>
The attached patch seems to be all that's needed.
--
Elias Pschernig
Index: src/unix/umodules.c
===================================================================
--- src/unix/umodules.c (revision 5757)
+++ src/unix/umodules.c (working copy)
@@ -99,8 +99,8 @@
}
for (pathptr = module_path; *pathptr; pathptr++) {
- snprintf(fullpath, sizeof fullpath, "%s/%d.%d/modules.lst",
- *pathptr, ALLEGRO_VERSION, ALLEGRO_SUB_VERSION);
+ snprintf(fullpath, sizeof fullpath, "%s/%d.%d.%d/modules.lst",
+ *pathptr, ALLEGRO_VERSION, ALLEGRO_SUB_VERSION, ALLEGRO_WIP_VERSION);
fullpath[(sizeof fullpath) - 1] = 0;
f = pack_fopen(uconvert_ascii(fullpath, buf), F_READ);
if (f) goto found;
Index: makefile.in
===================================================================
--- makefile.in (revision 5757)
+++ makefile.in (working copy)
@@ -20,7 +20,7 @@
mandir = @mandir@
libdir = @libdir@
modulebasedir = $(libdir)/allegro
-moduledir = $(modulebasedir)/$(shared_major_minor)
+moduledir = $(modulebasedir)/$(shared_version)
EXE =
OBJ = .o