Changeset 1793 for trunk/UTIL/fait_AA_make

Timestamp:

2010-01-06T20:20:12+01:00 (14 years ago)

Author:

rblod

Message:

Adaptation to use iomput with AGRIF, see ticket #630

File:

• trunk/UTIL/fait_AA_make (modified) (2 diffs)

trunk/UTIL/fait_AA_make

@@ -86 +86 @@
 
 # Agrif library and conv
-libagrif :  \$(call keycompat,key_iomput,key_agrif)
+libagrif :
 ifeq (\$(AGRIF),use)
    @( if [ ! -d OPAFILES ]; then mkdir OPAFILES; fi )
@@ -327 +327 @@
 
 echo '#check key compatibility'
-echo 'keycompat=$(if $(and $(findstring $1,$(P_P)),$(findstring $2,$(P_P))),$(error $1 and $2 NOT compatible))'
+echo 'keycompat=$(if $(word 2, $(findstring $1,$(P_P)) $(findstring $2,$(P_P))),$(error $1 and $2 NOT compatible))'
 
 echo ''