MR: link additional path; export env var AC_HOME, add to PATH

pencil-code · Oct 18, 2019 · 5225e0b · 5225e0b
1 parent 092d00f
commit 5225e0b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/bin/pc_setupsrc b/bin/pc_setupsrc
@@ -438,6 +438,7 @@ make_astaroth_dir()
   adddir $src/astaroth/submodule/acc
   adddir $src/astaroth/submodule/acc/src
   adddir $src/astaroth/submodule/acc/mhd_solver
+  adddir $src/astaroth/submodule/acc/pencil
 }
 #
 adddir()
@@ -466,7 +467,8 @@ $srcdir/astaroth/submodule/src/standalone/*.h $srcdir/astaroth/submodule/src/sta
 $srcdir/astaroth/submodule/src/standalone/CMakeLists.txt \
 $srcdir/astaroth/submodule/src/standalone/model/*.cc $srcdir/astaroth/submodule/src/standalone/model/*.h \
 $srcdir/astaroth/submodule/3rdparty/*.sh $srcdir/astaroth/submodule/scripts/*.sh \
-$srcdir/astaroth/submodule/acc/* $srcdir/astaroth/submodule/acc/src/* $srcdir/astaroth/submodule/acc/mhd_solver/*
+$srcdir/astaroth/submodule/acc/* $srcdir/astaroth/submodule/acc/src/* $srcdir/astaroth/submodule/acc/mhd_solver/* \
+$srcdir/astaroth/submodule/acc/pencil/*.h
   do
     file_for_link $file
   done

diff --git a/sourceme.sh b/sourceme.sh
@@ -49,6 +49,11 @@ if [ -z $_sourceme ]; then	# called for the first time?
     # PATH=${PATH}:$PENCIL_HOME/bin:$PENCIL_HOME/utils:$PENCIL_HOME/utils/axel:$PENCIL_HOME/remesh/bin
     PATH=${PATH}:$PENCIL_HOME/bin:$PENCIL_HOME/utils:$PENCIL_HOME/utils/axel:$PENCIL_HOME/utils/xiangyu:$PENCIL_HOME/remesh/bin:$PENCIL_HOME/src/scripts
 
+    if ([ -d $PENCIL_HOME/src/astaroth/submodule/scripts ]); then
+      export AC_HOME=$PENCIL_HOME/src/astaroth/submodule
+      export PATH=${PATH}:$AC_HOME/scripts/
+    fi
+
     #  Set path for DX macros
     DXMACROS="${PENCIL_HOME}/dx/macros${DXMACROS:+:$DXMACROS}"