Skip to content
Snippets Groups Projects
Commit a2fb064d authored by WAUTELET Philippe's avatar WAUTELET Philippe
Browse files

Philippe 25/11/2016: minor correction for installmaster

(cherry picked from commit 7a1e8bc2)
parent 2d3c362f
No related branches found
No related tags found
No related merge requests found
...@@ -378,7 +378,7 @@ ifdef PROG_LIST ...@@ -378,7 +378,7 @@ ifdef PROG_LIST
prog : lib $(LIB_GRIBEX) prog : lib $(LIB_GRIBEX)
@$(MAKE) -I$(B)$(OBJDIR) DEP=YES $(PROG_LIST) @$(MAKE) -I$(B)$(OBJDIR) DEP=YES $(PROG_LIST)
install : $(patsubst %,%-${ARCH_XYZ},$(PROG_LIST)) install : $(patsubst %,%-${ARCH_XYZ},$(PROG_LIST)) install_tools
$(PROG_LIST) : OBJ_PROG=$(shell find $(PROG_DIR) -follow -type f -name "spll_*.f*" \ $(PROG_LIST) : OBJ_PROG=$(shell find $(PROG_DIR) -follow -type f -name "spll_*.f*" \
...@@ -396,12 +396,14 @@ else ...@@ -396,12 +396,14 @@ else
# ln -sf $(OBJDIR)/$(*F) $(SRC_MESONH)/exe/$(*F)-${ARCH_XYZ}-${VER_USER} # ln -sf $(OBJDIR)/$(*F) $(SRC_MESONH)/exe/$(*F)-${ARCH_XYZ}-${VER_USER}
ln -sf $(OBJDIR)/$(*F) $(SRC_MESONH)/exe/$(*F)${XYZ} ln -sf $(OBJDIR)/$(*F) $(SRC_MESONH)/exe/$(*F)${XYZ}
endif endif
rm -f $(SRC_MESONH)/exe/$(*F)_${ARCH_XYZ}~
install_tools :
ifdef MNH_TOOLS ifdef MNH_TOOLS
ln -sf $(OBJDIR)/LFI2CDF $(SRC_MESONH)/bin_tools/lfi2cdf ln -sf $(OBJDIR)/LFI2CDF $(SRC_MESONH)/bin_tools/lfi2cdf
ln -sf $(OBJDIR)/LFI2CDF $(SRC_MESONH)/bin_tools/cdf2cdf ln -sf $(OBJDIR)/LFI2CDF $(SRC_MESONH)/bin_tools/cdf2cdf
ln -sf $(OBJDIR)/LFI2CDF $(SRC_MESONH)/bin_tools/cdf2lfi ln -sf $(OBJDIR)/LFI2CDF $(SRC_MESONH)/bin_tools/cdf2lfi
endif endif
rm -f $(SRC_MESONH)/exe/$(*F)_${ARCH_XYZ}~
########################################################## ##########################################################
# # # #
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment