diff --git a/lang/m2/m2mm/Makefile b/lang/m2/m2mm/Makefile index 05361180..e2cbf9e6 100644 --- a/lang/m2/m2mm/Makefile +++ b/lang/m2/m2mm/Makefile @@ -14,7 +14,9 @@ GFILES =$(GENGFILES) $(GF) LLGENOPTIONS = PROFILE = M2COMPILER = m2 -CFLAGS = -O $(PROFILE) $(INCLUDES) -DSTATIC= -DM2COMPILER=\"$(M2COMPILER)\" +DEFDIR = lib/m2 +HOMEDIR = +CFLAGS = -O $(PROFILE) $(INCLUDES) -DSTATIC= -DM2COMPILER=\"$(M2COMPILER)\" -DDEF_DIR=$(DEFDIR) $(HOMEDIR) LINTFLAGS = -DSTATIC= -DNORCSID MALLOC = $(LIBDIR)/malloc.o LDFLAGS = -i $(PROFILE) @@ -34,7 +36,7 @@ HFILES =$(GENH) $(HSRC) GENFILES = $(GENGFILES) $(GENC) $(GENH) all: Cfiles - make "EMHOME="$(EMHOME) "M2COMPILER="$(M2COMPILER) m2mm + make "EMHOME="$(EMHOME) "DEFDIR="$(DEFDIR) "HOMEDIR="$(HOMEDIR) "M2COMPILER="$(M2COMPILER) m2mm install: all cp m2mm $(EMHOME)/bin diff --git a/lang/m2/m2mm/lib.c b/lang/m2/m2mm/lib.c index 04c64851..6511220a 100644 --- a/lang/m2/m2mm/lib.c +++ b/lang/m2/m2mm/lib.c @@ -13,6 +13,10 @@ #include #include "main.h" +#ifdef OTHER_HOME +#undef EM_DIR +#define EM_DIR OTHER_HOME +#endif static char lib_dir[128] = EM_DIR; static struct liblist { @@ -41,7 +45,8 @@ init_lib() { extern char *strcat(); - strcat(lib_dir, "/lib/m2"); + strcat(lib_dir, "/"); + strcat(lib_dir, DEF_DIR); AddLibDir(lib_dir); }