--- Makefile.in.orig
+++ Makefile.in
@@ -1,5 +1,5 @@
 CC=@CC@ -I.
-LFLAGS=-L.
+LFLAGS=@LDFLAGS@ -L.
 CFLAGS=@CFLAGS@
 AR=@AR@
 RANLIB=@RANLIB@
@@ -85,6 +85,9 @@
 blocktags: mktags
 	./mktags > blocktags
 
+mktags: mktags.c
+	cc -o $@ $<
+
 # example programs
 @THEME@theme:  theme.o $(COMMON) $(MKDLIB) mkdio.h
 @THEME@	$(CC) $(CFLAGS) $(LFLAGS) -o theme theme.o $(COMMON) -lmarkdown @LIBS@
@@ -123,11 +126,11 @@
 	done
 
 branch: tools/branch.c config.h
-	$(CC) -o branch tools/branch.c
+	cc -I. -o branch tools/branch.c
 cols:   tools/cols.c config.h
-	$(CC) -o cols tools/cols.c
+	cc -o cols tools/cols.c
 echo:   tools/echo.c config.h
-	$(CC) -o echo tools/echo.c
+	cc -o echo tools/echo.c
 	
 clean:
 	rm -f $(PGMS) $(TESTFRAMEWORK) $(SAMPLE_PGMS) *.o