security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

* gpgv.c: Removed g10defs.h. 

* Makefile.am: Include cmacros.am for common flags.
This commit is contained in:
Werner Koch 2004-02-12 09:28:52 +00:00
parent 584784ba6d
commit e99475d59e
5 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
g10/ChangeLog
View File

@ -1,3 +1,15 @@
2004-02-12 Werner Koch <wk@gnupg.org>
* gpgv.c: Removed g10defs.h.
* Makefile.am: Include cmacros.am for common flags.
2004-02-11 Werner Koch <wk@gnupg.org>
* openfile.c (try_make_homedir): Use GNUPG_DEFAULT_HOMEDIR.
* gpgv.c (main): Ditto.
* g10.c (main): Ditto.
2004-01-19 Moritz Schulte <mo@g10code.com>
* keygen.c (do_generate_keypair): Print member fname, instead of

17
g10/Makefile.am
View File

@ -19,16 +19,15 @@
## Process this file with automake to produce Makefile.in
localedir = $(datadir)/locale
INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/include -I$(top_srcdir)/intl -DLOCALEDIR=\"$(localedir)\" @LIBGCRYPT_CFLAGS@
EXTRA_DIST = options.skel
# it seems that we can't use this with automake 1.5
#OMIT_DEPENDENCIES = zlib.h zconf.h
libexecdir = @libexecdir@/@PACKAGE@
if ! HAVE_DOSISH_SYSTEM
AM_CFLAGS = -DGNUPG_LIBEXECDIR="\"$(libexecdir)\""
endif
AM_CPPFLAGS = -I$(top_srcdir)/common -I$(top_srcdir)/include \
-I$(top_srcdir)/intl
include $(top_srcdir)/am/cmacros.am
AM_CFLAGS = $(LIBGCRYPT_CFLAGS)
needed_libs = ../common/libcommon.a ../jnlib/libjnlib.a
bin_PROGRAMS = gpg2 gpgv2

2
g10/g10.c
View File

@ -1238,7 +1238,7 @@ main( int argc, char **argv )
set_homedir ( getenv("GNUPGHOME") );
#endif
if( !*opt.homedir )
set_homedir ( GNUPG_HOMEDIR );
set_homedir ( GNUPG_DEFAULT_HOMEDIR );
/* check whether we have a config file on the commandline */
orig_argc = argc;

3
g10/gpgv.c
View File

@ -46,7 +46,6 @@
#include "ttyio.h"
#include "i18n.h"
#include "status.h"
#include "g10defs.h"
enum cmd_and_opt_values { aNull = 0,
@ -163,7 +162,7 @@ main( int argc, char **argv )
opt.homedir = getenv("GNUPGHOME");
#endif
if( !opt.homedir || !*opt.homedir ) {
opt.homedir = GNUPG_HOMEDIR;
opt.homedir = GNUPG_DEFAULT_HOMEDIR;
}
tty_no_terminal(1);
tty_batchmode(1);

2
g10/openfile.c
View File

@ -360,7 +360,7 @@ copy_options_file( const char *destdir )
void
try_make_homedir( const char *fname )
{
const char *defhome = GNUPG_HOMEDIR;
const char *defhome = GNUPG_DEFAULT_HOMEDIR;
/* Create the directory only if the supplied directory name
* is the same as the default one. This way we avoid to create