--- Makefile.in.orig	Wed Apr 19 14:09:58 2000
+++ Makefile.in	Fri Apr 21 19:20:46 2000
@@ -3,16 +3,16 @@
 SRCDIR		=$(PROGRAM)-$(VERSION)
 OBJS		= glbiff.o mail.o draw.o astro.o cfg.o
 
-INST_DIR	= /usr/local
+INST_DIR	= @exec_prefix@
 BIN_DIR		= $(INST_DIR)/bin
 MAN_DIR		= $(INST_DIR)/man
 
 TAGS		= ctags-exuberant
 
 #DEBUG		= -g3 -DDEBUG
 
-LIBS		= @LIBS@
-CXXFLAGS	= $(DEBUG) @CXXFLAGS@ -DVERSION=\"$(VERSION)\"
+LIBS		= @LIBS@ @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@
+CXXFLAGS	= $(DEBUG) @CXXFLAGS@ @X_CFLAGS@ @CPPFLAGS@ -DVERSION=\"$(VERSION)\"
 
 all:		$(PROGRAM)