--- spice3f5sfix/conf/linux	1999-06-25 07:24:00.000000000 +0200
+++ spice3f5sfix/conf/linux	2007-01-07 23:36:05.000000000 +0100
@@ -1,10 +1,10 @@
 # Linux/GNU (installs under /usr/local/spice) 
 
-DEFAULT_EDITOR  = joe
+DEFAULT_EDITOR  = vi
 ASCII_RAWFILE	= 0
 INTERFACE_OPTS	= -DWANT_X11
 MAKE            = make
-X_DIR           = /usr/X11R6
+X_DIR           = /usr
 INCX            = -I$(X_DIR)/include -I$(X_DIR)/include/X11        \
                   -I$(X_DIR)/include/X11/Xmu                       \
                   -I$(X_DIR)/include/X11/Xaw
@@ -14,12 +14,13 @@
 
 CC_OPT	        = -O2 -s
-
+LIB = lib
-SPICE_DIR       = /usr/local/spice
-SPICE_LIB_DIR   = $(SPICE_DIR)/lib
+SPICE_DIR       = /usr
+ 
+SPICE_LIB_DIR   = $(SPICE_DIR)/$(LIB)/spice
 SPICE_EXEC_DIR  = $(SPICE_DIR)/bin
 
 S_SPICE_DIR     = $(SPICE_DIR)
-S_SPICE_LIB_DIR	= $(S_SPICE_DIR)/lib
+S_SPICE_LIB_DIR	= $(S_SPICE_DIR)/$(LIB)/spice
 S_SPICE_EXEC_DIR= $(S_SPICE_DIR)/bin
 
 INSTALL_DIRS    = $(SPICE_DIR) $(SPICE_EXEC_DIR) $(SPICE_LIB_DIR)