Commit adf8a0cb authored by Marcus Meissner's avatar Marcus Meissner Committed by Alexandre Julliard

Use @sysconfdir@ for the default registries in misc/registry.c too.

parent e1f81a68
DEFS = @DLLFLAGS@ -D__WINE__
sysconfdir = @sysconfdir@
DEFS = @DLLFLAGS@ -D__WINE__ -DETCDIR="\"$(sysconfdir)\""
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ..
SRCDIR = @srcdir@
......
......@@ -51,8 +51,8 @@ static void REGISTRY_Init(void);
/* NOTE: do not append a /. linux' mkdir() WILL FAIL if you do that */
#define WINE_PREFIX "/.wine"
#define SAVE_USERS_DEFAULT "/usr/local/etc/wine.userreg"
#define SAVE_LOCAL_MACHINE_DEFAULT "/usr/local/etc/wine.systemreg"
#define SAVE_USERS_DEFAULT ETCDIR"/wine.userreg"
#define SAVE_LOCAL_MACHINE_DEFAULT ETCDIR"/wine.systemreg"
/* relative in ~user/.wine/ : */
#define SAVE_CURRENT_USER "user.reg"
......@@ -1883,12 +1883,12 @@ void SHELL_LoadRegistry( void )
_w95_loadreg("user.dat", HKU);
/*
* Load the global HKU hive directly from /usr/local/etc
* Load the global HKU hive directly from sysconfdir
*/
_wine_loadreg( HKU, SAVE_USERS_DEFAULT, 0);
/*
* Load the global machine defaults directly form /usr/local/etc
* Load the global machine defaults directly form sysconfdir
*/
_wine_loadreg( HKLM, SAVE_LOCAL_MACHINE_DEFAULT, 0);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment