use of EXTSEP_S

3 files changed, 7 insertions, 2 deletions

diff --git a/g10/ChangeLog b/g10/ChangeLog
index 704064d00..d9da39f43 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-06  Stefan Bellon  <[email protected]>
+
+	* g10.c (main): Use of EXTSEP_S in new gpg.conf string.
+	* openfile.c (copy_options_file): Ditto.
+
 2002-08-06  David Shaw  <[email protected]>
 
 	* options.h, g10.c (main), mainproc.c (proc_encrypted):
diff --git a/g10/g10.c b/g10/g10.c
index c92d834d3..8dcf6b40f 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -982,7 +982,7 @@ main( int argc, char **argv )
 
     if( default_config )
       {
-	configname = make_filename(opt.homedir, "gpg.conf", NULL );
+	configname = make_filename(opt.homedir, "gpg" EXTSEP_S "conf", NULL );
         if (!access (configname, R_OK))
           { /* Print a warning when both config files are present. */
             char *p = make_filename(opt.homedir, "options", NULL );
diff --git a/g10/openfile.c b/g10/openfile.c
index 84e600cbf..083ec93bf 100644
--- a/g10/openfile.c
+++ b/g10/openfile.c
@@ -301,7 +301,7 @@ copy_options_file( const char *destdir )
 	m_free(fname);
 	return;
     }
-    strcpy(stpcpy(fname, destdir), DIRSEP_S "gpg.conf" );
+    strcpy(stpcpy(fname, destdir), DIRSEP_S "gpg" EXTSEP_S "conf" );
     dst = fopen( fname, "w" );
     if( !dst ) {
 	log_error(_("%s: can't create: %s\n"), fname, strerror(errno) );