diff -p -up elmer-5.4.1.4579/ElmerGUItester/src/tester.cpp.orig elmer-5.4.1.4579/ElmerGUItester/src/tester.cpp --- elmer-5.4.1.4579/ElmerGUItester/src/tester.cpp.orig 2010-08-22 15:17:19.000000000 -0300 +++ elmer-5.4.1.4579/ElmerGUItester/src/tester.cpp 2010-08-22 15:17:52.000000000 -0300 @@ -169,8 +169,8 @@ void Tester::verdict() e->append("Elmer seems to be installed incorrectly on this system"); e->append("1) Make sure that ELMER_HOME has been set up properly"); - e->append("2) Set ELMERGUI_HOME to ELMER_HOME/bin"); - e->append("3) Set ELMER_POST_HOME to ELMER_HOME/share/elmerpost"); + e->append("2) Set ELMERGUI_HOME to ELMER_HOME"); + e->append("3) Set ELMER_POST_HOME to ELMER_HOME"); e->append("4) Make sure that ELMER_HOME/bin is in PATH"); #ifdef Q_WS_WIN e->append("5) Make sure that ELMER_HOME/lib is in PATH"); diff -p -up elmer-5.4.1.4579/fem/configure.in.orig elmer-5.4.1.4579/fem/configure.in --- elmer-5.4.1.4579/fem/configure.in.orig 2010-08-22 15:15:53.000000000 -0300 +++ elmer-5.4.1.4579/fem/configure.in 2010-08-22 15:16:09.000000000 -0300 @@ -285,7 +285,7 @@ AC_SUBST(FCFLAGS) AC_SUBST(OFF_KIND) AC_SUBST(LONG_KIND) -AC_DEFINE_UNQUOTED(ELMER_SOLVER_HOME,"${prefix}/share/elmersolver", [Elmer solver default install directory]) +AC_DEFINE_UNQUOTED(ELMER_SOLVER_HOME,"${prefix}", [Elmer solver default install directory]) AC_CONFIG_HEADER(config.h) # runtests needs to be runnable diff -p -up elmer-5.4.1.4579/fem/configure.orig elmer-5.4.1.4579/fem/configure --- elmer-5.4.1.4579/fem/configure.orig 2010-08-22 15:16:21.000000000 -0300 +++ elmer-5.4.1.4579/fem/configure 2010-08-22 15:16:41.000000000 -0300 @@ -16539,7 +16539,7 @@ echo "${ECHO_T}defining LONG_KIND to be cat >>confdefs.h <<_ACEOF -#define ELMER_SOLVER_HOME "${prefix}/share/elmersolver" +#define ELMER_SOLVER_HOME "${prefix}" _ACEOF ac_config_headers="$ac_config_headers config.h" diff -p -up elmer-5.4.1.4579/fem/src/ElementDescription.src.orig elmer-5.4.1.4579/fem/src/ElementDescription.src --- elmer-5.4.1.4579/fem/src/ElementDescription.src.orig 2010-08-22 15:18:04.000000000 -0300 +++ elmer-5.4.1.4579/fem/src/ElementDescription.src 2010-08-22 15:18:24.000000000 -0300 @@ -439,7 +439,7 @@ CONTAINS IF ( k > 0 ) THEN WRITE( str, '(a,a)' ) elmer_home(1:k),& -'/share/elmersolver/lib/elements.def' +'/lib/elements.def' ELSE WRITE( str, '(a,a)' ) & ELMER_SOLVER_HOME,& diff -p -up elmer-5.4.1.4579/fem/src/elmerf90.in.orig elmer-5.4.1.4579/fem/src/elmerf90.in --- elmer-5.4.1.4579/fem/src/elmerf90.in.orig 2010-08-22 15:18:36.000000000 -0300 +++ elmer-5.4.1.4579/fem/src/elmerf90.in 2010-08-22 15:19:02.000000000 -0300 @@ -3,10 +3,10 @@ if test "$ELMER_LIB" = ""; then if test "$ELMER_HOME" = ""; then LIBDIR=@prefix@/lib - INCLUDE=@prefix@/share/elmersolver/include + INCLUDE=@prefix@/include else LIBDIR=$ELMER_HOME/lib - INCLUDE=$ELMER_HOME/share/elmersolver/include + INCLUDE=$ELMER_HOME/include fi else LIBDIR=$ELMER_LIB diff -p -up elmer-5.4.1.4579/fem/src/elmerf90-nosh.in.orig elmer-5.4.1.4579/fem/src/elmerf90-nosh.in --- elmer-5.4.1.4579/fem/src/elmerf90-nosh.in.orig 2010-08-22 15:19:16.000000000 -0300 +++ elmer-5.4.1.4579/fem/src/elmerf90-nosh.in 2010-08-22 15:19:27.000000000 -0300 @@ -2,9 +2,9 @@ if test "$ELMER_LIB" = ""; then if test "$ELMER_HOME" = ""; then - INCLUDE=@prefix@/share/elmersolver/include + INCLUDE=@prefix@/include else - INCLUDE=$ELMER_HOME/share/elmersolver/include + INCLUDE=$ELMER_HOME/include fi INCLUDE_DEF=. else diff -p -up elmer-5.4.1.4579/fem/src/Load.c.orig elmer-5.4.1.4579/fem/src/Load.c --- elmer-5.4.1.4579/fem/src/Load.c.orig 2010-08-22 15:19:45.000000000 -0300 +++ elmer-5.4.1.4579/fem/src/Load.c 2010-08-22 15:20:27.000000000 -0300 @@ -207,7 +207,7 @@ void *STDCALLBULL FC_FUNC(loadfunction,L cptr = (char *)getenv("ELMER_HOME"); if ( cptr != NULL ) { strncpy( ElmerLib, cptr, 2*MAX_PATH_LEN ); - strncat( ElmerLib, "/share/elmersolver/lib/", 2*MAX_PATH_LEN ); + strncat( ElmerLib, "/lib/", 2*MAX_PATH_LEN ); } else { strncpy( ElmerLib, ELMER_SOLVER_HOME, 2*MAX_PATH_LEN ); strncat( ElmerLib, "/lib/", 2*MAX_PATH_LEN ); @@ -281,7 +281,7 @@ void *STDCALLBULL FC_FUNC(loadfunction,L cptr = (char *)getenv("ELMER_HOME"); if ( cptr != NULL ) { strncpy( ElmerLib, cptr, 2*MAX_PATH_LEN ); - strncat( ElmerLib, "/share/elmersolver/lib/", 2*MAX_PATH_LEN ); + strncat( ElmerLib, "/lib/", 2*MAX_PATH_LEN ); } else { strncpy( ElmerLib, ELMER_SOLVER_HOME, 2*MAX_PATH_LEN ); strncat( ElmerLib, "/lib/", 2*MAX_PATH_LEN ); diff -p -up elmer-5.4.1.4579/fem/src/ModelDescription.src.orig elmer-5.4.1.4579/fem/src/ModelDescription.src --- elmer-5.4.1.4579/fem/src/ModelDescription.src.orig 2010-08-22 15:20:41.000000000 -0300 +++ elmer-5.4.1.4579/fem/src/ModelDescription.src 2010-08-22 15:21:01.000000000 -0300 @@ -801,7 +801,7 @@ CONTAINS str = 'ELMER_HOME'; str(11:11) = CHAR(0) CALL envir( str,str1,k ) IF ( k > 0 ) THEN - str1 = str1(1:k) // '/share/elmersolver/lib/' // 'SOLVER.KEYWORDS' + str1 = str1(1:k) // '/lib/' // 'SOLVER.KEYWORDS' ELSE str1 = ELMER_SOLVER_HOME & // "/lib" // "/SOLVER.KEYWORDS" diff -p -up elmer-5.4.1.4579/fem/tests/runtests.in.orig elmer-5.4.1.4579/fem/tests/runtests.in --- elmer-5.4.1.4579/fem/tests/runtests.in.orig 2010-08-22 15:21:13.000000000 -0300 +++ elmer-5.4.1.4579/fem/tests/runtests.in 2010-08-22 15:21:37.000000000 -0300 @@ -36,8 +36,8 @@ else # ELMER_HOME is defined, so we'll just use that printf "ELMER_HOME=%s\n" $ELMER_HOME export ELMER_HOME=`echo $ELMER_HOME | sed 's+.:+/&+' | sed 's.:..' | sed 's.\\\./.g'` - export ELMER_LIB="$ELMER_HOME/share/elmersolver/lib" - export ELMER_INCLUDE="$ELMER_HOME/share/elmersolver/include" + export ELMER_LIB="$ELMER_HOME/lib" + export ELMER_INCLUDE="$ELMER_HOME/include" export ELMER_GRID="$ELMER_HOME/bin/ElmerGrid" export ELMER_SOLVER="$ELMER_HOME/bin/ElmerSolver" export ELMER_MESH2D="$ELMER_HOME/bin/Mesh2D" diff -p -up elmer-5.4.1.4579/front/src/ecif_userinterface_TCL.cpp.orig elmer-5.4.1.4579/front/src/ecif_userinterface_TCL.cpp --- elmer-5.4.1.4579/front/src/ecif_userinterface_TCL.cpp.orig 2010-08-22 15:13:31.000000000 -0300 +++ elmer-5.4.1.4579/front/src/ecif_userinterface_TCL.cpp 2010-08-22 15:14:24.000000000 -0300 @@ -5291,14 +5291,12 @@ UserInterface_TCL::start(int argc, char* if (!path_found) { file_strm.seekp(0); lib_strm.seekp(0); - - file_strm << ELMER_FRONT_PREFIX - << "/share/elmerfront" + + file_strm << ELMER_FRONT_PREFIX << "/" << front_tcl_path << "/" << controlSideScript << ends; - lib_strm << ELMER_FRONT_PREFIX - << "/share/elmerfront/tcl/" + lib_strm << ELMER_FRONT_PREFIX << "/" << ends; // Try to open start-script! printf("Trying %s\n",file_buffer); diff -p -up elmer-5.4.1.4579/front/src/tcl/ecif_tcl_mainScript.tcl.in.orig elmer-5.4.1.4579/front/src/tcl/ecif_tcl_mainScript.tcl.in --- elmer-5.4.1.4579/front/src/tcl/ecif_tcl_mainScript.tcl.in.orig 2010-08-22 15:14:36.000000000 -0300 +++ elmer-5.4.1.4579/front/src/tcl/ecif_tcl_mainScript.tcl.in 2010-08-22 15:15:09.000000000 -0300 @@ -189,12 +189,12 @@ proc startGUI {} { proc setElmerFrontPaths {} { global Info env - set Info(ELMER_FRONT_INSTALL_LIB) "@prefix@/share/elmerfront/lib" - set Info(ELMER_FRONT_INSTALL_TCL) "@prefix@/share/elmerfront/tcl" + set Info(ELMER_FRONT_INSTALL_LIB) "/usr/share/elmer/lib" + set Info(ELMER_FRONT_INSTALL_TCL) "/usr/share/elmer/tcl" if { [info exists env(ELMER_HOME)] } { - set Info(ELMER_FRONT_INSTALL_LIB) "$env(ELMER_HOME)/share/elmerfront/lib" - set Info(ELMER_FRONT_INSTALL_TCL) "$env(ELMER_HOME)/share/elmerfront/tcl" + set Info(ELMER_FRONT_INSTALL_LIB) "$env(ELMER_HOME)/lib" + set Info(ELMER_FRONT_INSTALL_TCL) "$env(ELMER_HOME)/tcl" } if { [info exists env(ELMER_FRONT_HOME)] } { diff -p -up elmer-5.4.1.4579/post/configure.in.orig elmer-5.4.1.4579/post/configure.in --- elmer-5.4.1.4579/post/configure.in.orig 2010-08-22 15:15:22.000000000 -0300 +++ elmer-5.4.1.4579/post/configure.in 2010-08-22 15:15:42.000000000 -0300 @@ -73,7 +73,7 @@ ACX_SHLIB_STUFF AC_SUBST(SH_LDFLAGS) AC_SUBST(SH_LD) -AC_DEFINE_UNQUOTED(ELMER_POST_HOME,"${prefix}/share/elmerpost", [Elmer post default install directory]) +AC_DEFINE_UNQUOTED(ELMER_POST_HOME,"${prefix}", [Elmer post default install directory]) AM_CONDITIONAL(NOTWINDOWS, test "$acx_platform_def" != "WIN32") AM_CONDITIONAL(NOTMINGW32, test "$acx_platform_mgw" != "TRUE" ) diff -p -up elmer-5.4.1.4579/post/configure.orig elmer-5.4.1.4579/post/configure --- elmer-5.4.1.4579/post/configure.orig 2010-08-22 15:16:51.000000000 -0300 +++ elmer-5.4.1.4579/post/configure 2010-08-22 15:17:07.000000000 -0300 @@ -12939,7 +12939,7 @@ fi cat >>confdefs.h <<_ACEOF -#define ELMER_POST_HOME "${prefix}/share/elmerpost" +#define ELMER_POST_HOME "${prefix}" _ACEOF