Merge tag 'upstream/4.2.4a'

Upstream version 4.2.4a

1 files changed, 6 insertions, 6 deletions

diff --git a/app/wlib/gtklib/wpref.c b/app/wlib/gtklib/wpref.c
index b79c8d2..4df3de9 100644
--- a/app/wlib/gtklib/wpref.c
+++ b/app/wlib/gtklib/wpref.c
@@ -66,8 +66,8 @@ EXPORT const char * wGetAppLibDir( void )
  *  The search order is:
  *  1. Directory specified by the XTRKCADLIB environment variable
  *  2. Directory specified by XTRKCAD_INSTALL_PREFIX/share/xtrkcad
- *  3. /usr/lib/xtrkcad
- *  4. /usr/local/lib/xtrkcad
+ *  3. /usr/share/xtrkcad
+ *  4. /usr/local/share/xtrkcad
  *  
  *  \return pointer to directory name
  */
@@ -102,13 +102,13 @@ EXPORT const char * wGetAppLibDir( void )
 	}
 #endif
 
-	strcpy( appLibDir, "/usr/lib/" );
+	strcpy( appLibDir, "/usr/share/" );
 	strcat( appLibDir, wAppName );
 	if ((stat( appLibDir, &buf) == 0 ) && S_ISDIR( buf.st_mode)) {
 		return appLibDir;
 	}
 
-	strcpy( appLibDir, "/usr/local/lib/" );
+	strcpy( appLibDir, "/usr/local/share/" );
 	strcat( appLibDir, wAppName );
 	if ((stat( appLibDir, &buf) == 0 ) && S_ISDIR( buf.st_mode)) {
 		return appLibDir;
@@ -118,8 +118,8 @@ EXPORT const char * wGetAppLibDir( void )
 		_("The required configuration files could not be located in the expected location.\n\n"
 		"Usually this is an installation problem. Make sure that these files are installed in either \n"
 		"  %s/share/xtrkcad or\n"
-		"  /usr/lib/%s or\n"
-		"  /usr/local/lib/%s\n"
+		"  /usr/share/%s or\n"
+		"  /usr/local/share/%s\n"
 		"If this is not possible, the environment variable %s must contain "
 		"the name of the correct directory."),
 		XTRKCAD_INSTALL_PREFIX, wAppName, wAppName, envvar );