$NetBSD: patch-ab,v 1.2 2010/12/13 10:32:35 wiz Exp $ --- src/params.h.orig 2010-06-14 02:38:55.000000000 +0000 +++ src/params.h @@ -51,15 +51,15 @@ * notes above. */ #ifndef JOHN_SYSTEMWIDE -#define JOHN_SYSTEMWIDE 0 +#define JOHN_SYSTEMWIDE 1 #endif #if JOHN_SYSTEMWIDE #ifndef JOHN_SYSTEMWIDE_EXEC /* please refer to the notes above */ -#define JOHN_SYSTEMWIDE_EXEC "/usr/libexec/john" +#define JOHN_SYSTEMWIDE_EXEC "@PREFIX@/bin" #endif #ifndef JOHN_SYSTEMWIDE_HOME -#define JOHN_SYSTEMWIDE_HOME "/usr/share/john" +#define JOHN_SYSTEMWIDE_HOME "@PREFIX@/share/john" #endif #define JOHN_PRIVATE_HOME "~/.john" #endif @@ -103,8 +103,8 @@ /* * File names. */ -#define CFG_FULL_NAME "$JOHN/john.conf" -#define CFG_ALT_NAME "$JOHN/john.ini" +#define CFG_FULL_NAME "@PREFIX@/share/john/john.conf" +#define CFG_ALT_NAME "@PREFIX@/share/john/john.ini" #if JOHN_SYSTEMWIDE #define CFG_PRIVATE_FULL_NAME JOHN_PRIVATE_HOME "/john.conf" #define CFG_PRIVATE_ALT_NAME JOHN_PRIVATE_HOME "/john.ini" @@ -118,7 +118,7 @@ #endif #define LOG_SUFFIX ".log" #define RECOVERY_SUFFIX ".rec" -#define WORDLIST_NAME "$JOHN/password.lst" +#define WORDLIST_NAME "@PREFIX@/share/john/password.lst" /* * Configuration file section names.