diff --git a/src/makefile.py b/src/makefile.py index 3350d93..c93ea82 100644 --- a/src/makefile.py +++ b/src/makefile.py @@ -91,13 +91,13 @@ def run(): print >>file, "ALL_OBJ = %s"%(" ".join(all_o)) print >>file, "ALL_OBJ1 = $(patsubst %%, %s%%,$(notdir $(ALL_OBJ)))"%(irpdir) print >>file, "all:$(ALL)" - print >>file, "\t@make -s move" + print >>file, "\t@$(MAKE) -s move" for m in mod: if m.is_main: exe = m.name[:-4] print >>file, "%s: %s%s.irp.o %s%s.irp.module.o $(OBJ1)"%(exe,irpdir,exe,irpdir,exe) print >>file, "\t$(FC) -o $@ %s$@.irp.o %s$@.irp.module.o $(OBJ1) $(LIB)"%(irpdir,irpdir) - print >>file, "\t@make -s move" + print >>file, "\t@$(MAKE) -s move" buffer = "" for m in mod: @@ -153,7 +153,7 @@ def run(): print >>file, irpdir+"%.irp.F90: irpf90.make\n" print >>file, "move:\n\t@mv -f *.mod IRPF90_temp/ 2> /dev/null | DO_NOTHING=\n" print >>file, "clean:\n\trm -rf $(EXE) $(OBJ1) $(ALL_OBJ1) $(ALL)\n" - print >>file, "veryclean:\n\t- make clean\n" + print >>file, "veryclean:\n\t- $(MAKE) clean\n" print >>file, "\t- rm -rf "+irpdir+" "+mandir+" irpf90.make irpf90_variables dist\n" file.close() diff --git a/src/version.py b/src/version.py index 7ad8ece..7f9c68e 100644 --- a/src/version.py +++ b/src/version.py @@ -1 +1 @@ -version = "1.1.57" +version = "1.1.58"