From 7a1e8bc2485a1c62a2afb8b16019069928e439ee Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Fri, 25 Nov 2016 09:54:43 +0100
Subject: [PATCH] Philippe 25/11/2016: minor correction for installmaster
---
src/Makefile | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/Makefile b/src/Makefile
index 40a38187c..d265a6157 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -357,7 +357,7 @@ ifdef PROG_LIST
prog : lib $(LIB_GRIBEX)
@$(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*" \
@@ -375,12 +375,14 @@ else
# ln -sf $(OBJDIR)/$(*F) $(SRC_MESONH)/exe/$(*F)-${ARCH_XYZ}-${VER_USER}
ln -sf $(OBJDIR)/$(*F) $(SRC_MESONH)/exe/$(*F)${XYZ}
endif
+ rm -f $(SRC_MESONH)/exe/$(*F)_${ARCH_XYZ}~
+
+install_tools :
ifdef MNH_TOOLS
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/cdf2lfi
endif
- rm -f $(SRC_MESONH)/exe/$(*F)_${ARCH_XYZ}~
##########################################################
# #
--
GitLab