--- config/options.h-vanilla.orig	Mon May 20 04:11:25 1996
+++ config/options.h-vanilla	Wed Jan 14 10:47:33 1998
@@ -45,7 +45,7 @@
 #define CONFIG_DIR "/etc/amanda"
 #define LIBEXEC_DIR "/usr/local/libexec/amanda"
 #define BIN_DIR	"/usr/local/sbin"
-#define MAN_DIR	"/usr/share/local/man/man8"
+#define MAN_DIR	"/usr/local/man/man8"
 
 
 /*
@@ -62,6 +62,9 @@
 /* #undef  MK_CC		*/
 /* #define MK_CC gcc -Wall	*/
 
+/* We want to install files as root for security reasons */
+#undef MK_INSTFLAGS
+#define MK_INSTFLAGS	-c -o root
 
 /*
  * With USE_VERSION_SUFFIXES defined, all the Amanda binaries will be
@@ -77,7 +80,7 @@
  * Since 2.2.1 is a major change, I recommend defining this for existing
  * Amanda sites.
  */
-#define USE_VERSION_SUFFIXES
+/*#define USE_VERSION_SUFFIXES*/
 
 
 /*
@@ -151,7 +154,7 @@
  * on /etc/dumpdates.
 
  */
-#define FORCE_USERID
+#undef FORCE_USERID
 
 #ifdef FORCE_USERID
 #  define CLIENT_LOGIN	"bin"
@@ -182,17 +185,17 @@
 #define HAVE_GZIP
 
 #ifdef HAVE_GZIP
-#  define COMPRESS_PATH  	"/usr/imports/bin/gzip"
+#  define COMPRESS_PATH  	"/usr/bin/gzip"
 #  define COMPRESS_SUFFIX 	".gz"
 #  define COMPRESS_FAST_OPT	"--fast"
 #  define COMPRESS_BEST_OPT	"--best"
-#  define UNCOMPRESS_CMD	"gzcat"
+#  define UNCOMPRESS_CMD	"/usr/bin/gzcat"
 #else
 #  define COMPRESS_PATH		COMPRESS	/* defined in config.h */
 #  define COMPRESS_SUFFIX	".Z"
 #  define COMPRESS_FAST_OPT	"-f"		/* -f doesn't do anything */
 #  define COMPRESS_BEST_OPT	"-f"		/* it's just a placeholder */
-#  define UNCOMPRESS_CMD	"zcat"
+#  define UNCOMPRESS_CMD	"/usr/bin/zcat"
 #endif
 
 /*
@@ -206,5 +209,5 @@
  * you must install it and specify its path here.
  */
 #ifndef GNUTAR
-#define GNUTAR		"/usr/imports/bin/gtar"
+#define GNUTAR		"/usr/local/bin/gtar"
 #endif
