--- a/Makefile.in	2006-03-10 20:42:12.000000000 -0500
+++ b/Makefile.in.new	2010-08-12 21:12:41.000000000 -0400
@@ -52,7 +52,7 @@
 PROGAGREP	= agrep/agrep
 OPTIMIZEFLAGS   = -O2
 INCLUDEFLAGS    = -I$(INDEXDIR) -I$(AGREPDIR) -I$(TEMPLATEDIR)/include
-CFLAGS          = $(INCLUDEFLAGS) $(DEFS)
+CFLAGS          = $(INCLUDEFLAGS) $(DEFS) $(OPTIMIZEFLAGS)
 
 OBJS		= get_filename.o \
 		get_index.o \
@@ -78,7 +78,7 @@
 		$(INDEXDIR)/memlook.c \
 		$(INDEXDIR)/io.c
 
-all:	build-sub @TARGET@
+all:	build-sub
 Sall:		$(PROG) $(PROGSERVER) $(PROGINDEX) 
 agrep:		$(PROGAGREP)
 NOTSall:	$(NOTSPROG) $(NOTSPROGSERVER)
@@ -87,6 +87,7 @@
 	for d in $(SUBDIRS) ; do \
 		( cd $$d; $(MAKE) ); \
 	done
+	$(MAKE) @TARGET@
 
 # Check target
 
@@ -105,11 +106,11 @@
 
 install-man:
 	for d in $(MANUAL) ; do \
-		$(INSTALL_MAN) $$d $(mandir) ; \
+		$(INSTALL_MAN) $$d $(mandir)/man1/ ; \
 	done
 
 installdirs:	mkinstalldirs
-	$(srcdir)/mkinstalldirs $(bindir) $(mandir)
+	$(srcdir)/mkinstalldirs $(bindir) $(mandir)/man1/
 
 clean:
 	for d in $(SUBDIRS); do \