--- file_not_specified_in_diff	
+++ file_not_specified_in_diff	
@@ -, +, @@ 
--- Makefile
+++ Makefile
@@ -6,8 +6,7 @@ 
 #
 
 TOP=.
-SUBDIRS = src tests homepage examples
-SUBDIRS += homepage/ref homepage/source
+SUBDIRS = src tests examples
 
 include $(TOP)/Makefile.config
 
--- Makefile.config
+++ Makefile.config
@@ -19,8 +19,8 @@ 
 EXEEXT = .exe
 OS = Win32
 else
-CC = gcc
-LINK = gcc
+CC ?= gcc
+LINK ?= gcc
 OBJEXT = o
 EXEEXT = 
 OS = $(shell uname -s)-$(shell uname -m)
@@ -30,7 +30,7 @@ 
 DIFF = diff -q
 
 DESTDIR = 
-prefix = $(DESTDIR)/usr/local
+prefix = $(DESTDIR)/usr
 bindir = $(prefix)/bin
 docdir = $(prefix)/share/doc
 pkgdocdir = $(prefix)/share/doc/htp
@@ -38,7 +38,7 @@ 
 #
 # tool command-line options ... notice that these are geared towards GNU
 #
-CCOPT = -c
+CCOPT = -c ${CFLAGS}
 ifdef WIN32DMC
 CCOPT += -o
 else
--- src/Makefile.sub
+++ src/Makefile.sub
@@ -41,13 +41,13 @@ 
 
 src-install-bin: $(HTP)
 	mkdir -p $(bindir)
-	$(INSTALL) -s $(HTP) $(bindir)
+	$(INSTALL) $(HTP) $(bindir)
 
 #
 # explicit dependency: final executable
 #
 $(HTP) : $(OBJ)
-	$(LINK) -o $@ $(OBJ) $(LOPT)
+	$(LINK) $(LDFLAGS) -o $@ $(OBJ) $(LOPT)
 
 #
 # implicit dependencies for source code
--- tests/Makefile.sub
+++ tests/Makefile.sub
@@ -23,11 +23,10 @@ 
 HTML += $(TESTS_HTML)
 
 .PHONY: check
-all: check
 
 $(TESTS_HTML): $(TOP)/tests/htp.def 
 $(TOP)/tests/files.html: $(TOP)/tests/files.hti
 
 check: $(TESTS_HTML)
 	@for i in $(TESTS_HTML); do \
-	$(DIFF) -bw $$i $$i.exp || echo "TEST FAILED: $$i"; done
+		$(DIFF) -bw $$i $$i.exp || exit 1; done
--- examples/Makefile.sub
+++ examples/Makefile.sub
@@ -16,4 +16,4 @@ 
 DISTFILES += $(DIR)/Makefile.sub $(EXAMPLES_SRC) $(EXAMPLES_DEF)
 CLEAN += $(DIR)/*~ $(DIR)/htp.rsp $(DIR)/*.html $(DIR)/htpdeb.out
 
-all: $(EXAMPLES_HTML)
+examples: $(EXAMPLES_HTML)