ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Marcus Meissner 1999-06-12 08:18:38 +00:00 committed by Alexandre Julliard
parent e1f81a6814
commit adf8a0cbe6
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
misc/Makefile.in
View File

@ -1,4 +1,5 @@
DEFS = @DLLFLAGS@ -D__WINE__ sysconfdir = @sysconfdir@
DEFS = @DLLFLAGS@ -D__WINE__ -DETCDIR="\"$(sysconfdir)\""
TOPSRCDIR = @top_srcdir@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = .. TOPOBJDIR = ..
SRCDIR = @srcdir@ SRCDIR = @srcdir@

8
misc/registry.c
View File

@ -51,8 +51,8 @@ static void REGISTRY_Init(void);
/* NOTE: do not append a /. linux' mkdir() WILL FAIL if you do that */ /* NOTE: do not append a /. linux' mkdir() WILL FAIL if you do that */
#define WINE_PREFIX "/.wine" #define WINE_PREFIX "/.wine"
#define SAVE_USERS_DEFAULT "/usr/local/etc/wine.userreg" #define SAVE_USERS_DEFAULT ETCDIR"/wine.userreg"
#define SAVE_LOCAL_MACHINE_DEFAULT "/usr/local/etc/wine.systemreg" #define SAVE_LOCAL_MACHINE_DEFAULT ETCDIR"/wine.systemreg"
/* relative in ~user/.wine/ : */ /* relative in ~user/.wine/ : */
#define SAVE_CURRENT_USER "user.reg" #define SAVE_CURRENT_USER "user.reg"
@ -1883,12 +1883,12 @@ void SHELL_LoadRegistry( void )
_w95_loadreg("user.dat", HKU); _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); _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); _wine_loadreg( HKLM, SAVE_LOCAL_MACHINE_DEFAULT, 0);