--- config_h.in
+++ config_h.in
@@ -5,4 +5,10 @@
  * config.h -- Kevin Buettner.
  */
 
-@DEFS@
+#define HAVE_GETOPT_H 0
+#define HAVE_MALLOC_H 0
+#define HAVE_POPEN 0
+#define HAVE_STDLIB_H 0
+#define HAVE_STRING_H 0
+#define HAVE_UNISTD_H 0
+#define STDC_HEADERS 0
--- makefile.in
+++ makefile.in
@@ -8,6 +8,7 @@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
+DEFS		= @DEFS@
 CC		= @CC@
 LINK		= $(CC)
 INSTALL		= @INSTALL@
@@ -15,7 +16,7 @@
 INSTALL_DATA	= @INSTALL_DATA@
 
 CFLAGS		= @CFLAGS@ @EXTRA_CFLAGS@
-CPPFLAGS	= -I. -I$(srcdir) -DHAVE_CONFIG_H @CPPFLAGS@
+CPPFLAGS	= -I. -I$(srcdir) $(DEFS) @CPPFLAGS@
 
 LIBS		= @LIBS@
 LDFLAGS		= @LDFLAGS@
@@ -27,8 +28,8 @@
 prefix		= @prefix@
 exec_prefix	= @exec_prefix@
 
-bindir		= $(DESTDIR)@bindir@
-mandir		= $(DESTDIR)@mandir@
+bindir		= @bindir@
+mandir		= @mandir@
 
 #### End of system configuration section. ####
 
@@ -68,11 +69,11 @@
 	@ECHO_LD@$(LINK) $(LDFLAGS) -o $@ diffstat$o $(LIBS)
 
 install : all installdirs
-	$(INSTALL_PROGRAM) $(PROG) $(bindir)/$(PROG)
-	$(INSTALL_DATA) $(srcdir)/$(THIS).1 $(man1dir)/$(THIS).$(manext)
+	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(bindir)/$(PROG)
+	$(INSTALL_DATA) $(srcdir)/$(THIS).1 $(DESTDIR)$(man1dir)/$(THIS).$(manext)
 
 installdirs :
-	$(SHELL) ${srcdir}/mkdirs.sh $(bindir) $(libdir) $(man1dir)
+	$(SHELL) ${srcdir}/mkdirs.sh $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) $(DESTDIR)$(man1dir)
 
 uninstall :
 	rm -f $(bindir)/$(PROG) $(man1dir)/$(THIS).$(manext)