X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=cint%2Fginaccint.cpp;h=cd875e90879a58004a855e9427274b5cd4fbe4a4;hp=515835c14c02f57002a0747963dbc564abd038f5;hb=029a7f37abdeffb71ce07f33603e004558ed0f3c;hpb=c9282804ff4127fc84bb01b2b8707fbb6724b003

diff --git a/cint/ginaccint.cpp b/cint/ginaccint.cpp
index 515835c1..cd875e90 100644
--- a/cint/ginaccint.cpp
+++ b/cint/ginaccint.cpp
@@ -31,8 +31,11 @@ int main(int argc, char * *argv)
 	else
 		setenv("LD_LIBRARY_PATH", (std::string(LD_LIBRARY_PATH)+':'+libdir).c_str(), 1);
 	
-	// hard-wire CINTSYSDIR, inherited from configure, if it is not set
-	setenv("CINTSYSDIR", CINTSYSDIR.c_str(), 0);
+	// hard-wire CINTSYSDIR, inherited from configure, but only if it has
+	// been set therein (to allow for system-wide installations of cint)
+	// and without overriding it if the user has specified it.
+	if (CINTSYSDIR != "@CINTSYSDIR@")
+		setenv("CINTSYSDIR", CINTSYSDIR.c_str(), 0);
 	
 	// execute the real thing
 	int error = execve(binprog.c_str(), argv, environ);