Merge remote-tracking branch 'app4triqs/unstable' into unstable

TRIQS · Mar 26, 2024 · 7ab654c · 7ab654c
2 parents 7cc901a + 2ec749a
commit 7ab654c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -6,3 +6,9 @@ scikit-image
 numpydoc
 # From python 3.11 and newer, toml is part of standard implementation
 tomli
+# For documentation builds we additionaly require
+#sphinx
+#nbsphinx
+#sphinx_rtd_theme
+#myst_parser
+#linkify-it-py
diff --git a/share/solid_dmftvars.sh.in b/share/solid_dmftvars.sh.in
@@ -2,8 +2,8 @@
 
 export @PROJECT_NAME@_ROOT=@CMAKE_INSTALL_PREFIX@
 
-export CPLUS_INCLUDE_PATH=@CMAKE_INSTALL_FULL_INCLUDEDIR@:$CPLUS_INCLUDE_PATH
-export PATH=@CMAKE_INSTALL_FULL_BINDIR@:$PATH
+export CPLUS_INCLUDE_PATH=@CMAKE_INSTALL_PREFIX@/include:$CPLUS_INCLUDE_PATH
+export PATH=@CMAKE_INSTALL_PREFIX@/bin:$PATH
 export LIBRARY_PATH=@CMAKE_INSTALL_FULL_LIBDIR@:$LIBRARY_PATH
 export LD_LIBRARY_PATH=@CMAKE_INSTALL_FULL_LIBDIR@:$LD_LIBRARY_PATH
 export CMAKE_PREFIX_PATH=@CMAKE_INSTALL_PREFIX@:$CMAKE_PREFIX_PATH