Revision 1425 trunk/scripts/admb/admb

admb (revision 1425)
41 41
  popd &> /dev/null
42 42
done
43 43
pushd "$DIRECTORY/.." &> /dev/null
44
declare -rx ADMB_HOME="$PWD"
44
declare -rx ADMB_HOME=$PWD
45 45
popd &> /dev/null
46 46
PATH=$ADMB_HOME/bin:$PATH
47 47

  
......
148 148
else
149 149
  CXXFLAGS="$CXXFLAGS -DSAFE_ALL"
150 150
fi
151
CXXFLAGS="$CXXFLAGS -D__GNUDOS__ -Dlinux -DUSE_LAPLACE -I. -I\"$ADMB_HOME\"/include -I\"$ADMB_HOME\"/contrib/include"
151
CXXFLAGS="$CXXFLAGS -D__GNUDOS__ -Dlinux -DUSE_LAPLACE -I. -I$ADMB_HOME/include -I$ADMB_HOME/contrib/include"
152 152
if [ "$CXX" == "adcomp-x86_64-w64-mingw32" ]; then
153 153
  LDFLAGS="--static $LDFLAGS"
154 154
fi
......
240 240
  fi
241 241
  CMD="$CMD $file $objs"
242 242
  if [[ "$library" == "opt" ]]; then
243
    CMD="$CMD \"$ADMB_HOME\"/contrib/lib/libcontribo.a \"$ADMB_HOME\"/lib/libadmbo.a"
243
    CMD="$CMD $ADMB_HOME/contrib/lib/libcontribo.a $ADMB_HOME/lib/libadmbo.a"
244 244
  else
245
    CMD="$CMD \"$ADMB_HOME\"/contrib/lib/libcontrib.a \"$ADMB_HOME\"/lib/libadmb.a"
245
    CMD="$CMD $ADMB_HOME/contrib/lib/libcontrib.a $ADMB_HOME/lib/libadmb.a"
246 246
  fi
247 247
  echo -e \\n\*\*\* Linking $file $objs:\\n$CMD
248 248
  eval $CMD
......
285 285
  fi
286 286
  CMD="$CMD $listobjs"
287 287
  if [[ "$library" == "opt" ]]; then
288
    CMD="$CMD \"$ADMB_HOME\"/contrib/lib/libcontribo.a \"$ADMB_HOME\"/lib/libadmbo.a"
288
    CMD="$CMD $ADMB_HOME/contrib/lib/libcontribo.a $ADMB_HOME/lib/libadmbo.a"
289 289
  else
290
    CMD="$CMD \"$ADMB_HOME\"/contrib/lib/libcontrib.a \"$ADMB_HOME\"/lib/libadmb.a"
290
    CMD="$CMD $ADMB_HOME/contrib/lib/libcontrib.a $ADMB_HOME/lib/libadmb.a"
291 291
  fi
292 292
  echo -e \\n\*\*\* Linking $listobjs:\\n$CMD
293 293
  eval $CMD

Also available in: Unified diff