--- Makefile.in.orig	Sat Jul 24 01:24:43 1999
+++ Makefile.in	Fri May  5 21:52:52 2000
@@ -35,7 +35,7 @@
 COMPRESSSRC	= $(srcdir)/$(COMPRESSDIR)
 DESTDIR		= $(srcdir)/bin
 
-CFLAGS		= @CFLAGS@ -O -DSTRUCTURED_QUERIES=1
+CFLAGS		= -O @CFLAGS@ -DSTRUCTURED_QUERIES=1
 ALL_CFLAGS      = $(CFLAGS) $(DEFS) -I$(INDEXSRC) -I$(AGREPSRC) -I$(TEMPLATESRC)/include
 LINKFLAGS	= @LDFLAGS@ -I$(INDEXSRC) -I$(AGREPSRC) -I$(TEMPLATESRC)/include
 
@@ -85,11 +85,11 @@
 install:	all installdirs
 		cd $(DESTDIR) ;\
 		for f in $(ALL_PROGS) ; do \
-			$(INSTALL_PROGRAM) $$f $(bindir)/$(binprefix)$(f) ;\
+			$(INSTALL_PROGRAM) $$f $(bindir)/$(binprefix) ;\
 		done
 		cd $(srcdir) ;\
 		for f in $(ALL_MANS) ; do \
-			$(INSTALL_DATA) $$f $(mandir)/$(manprefix)$(f).$(manext) ;\
+			$(INSTALL_DATA) $$f $(mandir)/$(manprefix) ;\
 		done
 #		$(INSTALL_PROGRAM) $(PROGINDEX) $(bindir)/$(binprefix)glimpseindex
 #		$(INSTALL_PROGRAM) $(PROGAGREP) $(bindir)/$(binprefix)agrep