diff --git a/doc/Makefile.in b/doc/Makefile.in
index b2c43106..65907d44 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -65,13 +65,13 @@ doc: 	$(MANPAGES3)
 install:	$(MANPAGES3)
 	$(INSTALL) -m 755 -d $(DESTDIR)$(mandir)
 	$(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man3
-	for x in $(MANPAGES3); do echo $(INSTALL) -m 644 $$x $(DESTDIR)$(mandir)/man3; $(INSTALL) -m 644 $$x $(DESTDIR)$(mandir)/man3; for altpg in $$(./manpgaltnames $$x); do cp $$x $$altpg; echo $(INSTALL) -m 644 $$altpg $(DESTDIR)$(mandir)/man3; $(INSTALL) -m 644 $$altpg $(DESTDIR)$(mandir)/man3; done; done
+	for x in $(MANPAGES3); do echo $(INSTALL) -m 644 $$x $(DESTDIR)$(mandir)/man3; $(INSTALL) -m 644 $$x $(DESTDIR)$(mandir)/man3; for altpg in $$($(srcdir)/manpgaltnames $$x); do cp $$x $$altpg; echo $(INSTALL) -m 644 $$altpg $(DESTDIR)$(mandir)/man3; $(INSTALL) -m 644 $$altpg $(DESTDIR)$(mandir)/man3; done; done
 
 uninstall:
-	for x in $(MANPAGES3); do echo rm -f $(DESTDIR)$(mandir)/man3/$$x; rm -f $(DESTDIR)$(mandir)/man3/$$x; for altpg in $$(./manpgaltnames $$x); do echo rm -f $(DESTDIR)$(mandir)/man3/$$altpg;  rm -f $(DESTDIR)$(mandir)/man3/$$altpg; done; done
+	for x in $(MANPAGES3); do echo rm -f $(DESTDIR)$(mandir)/man3/$$x; rm -f $(DESTDIR)$(mandir)/man3/$$x; for altpg in $$($(srcdir)/manpgaltnames $$x); do echo rm -f $(DESTDIR)$(mandir)/man3/$$altpg;  rm -f $(DESTDIR)$(mandir)/man3/$$altpg; done; done
 
 clean:
-	for x in $(MANPAGES3); do rm -f $$(./manpgaltnames $$x); done
+	for x in $(MANPAGES3); do rm -f $$($(srcdir)/manpgaltnames $$x); done
 	rm -rf $(DOCDIRS) $(MANPAGES3)
 
 distclean : clean
diff --git a/src/Makefile.in b/src/Makefile.in
index 7863f426..7807d953 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -56,7 +56,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 CC=@CC@
-CFLAGS=@CFLAGS@ -Wall -I$(srcdir)/ -I/usr/local/include -std=c99
+CFLAGS=@CFLAGS@ -Wall -I$(srcdir) -I. -std=c99
 LDFLAGS=@LDFLAGS@ @LIBS@
 
 EXTENSION_LIBEVENT_LIB=@EXTENSION_LIBEVENT_LIB@
diff --git a/src/example/Makefile.in b/src/example/Makefile.in
index fd79adaa..d99d0281 100644
--- a/src/example/Makefile.in
+++ b/src/example/Makefile.in
@@ -40,8 +40,8 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 CC=@CC@
-CFLAGS=@CFLAGS@ -Wall -I$(srcdir)/ -I$(srcdir)/../ -I/usr/local/include -std=c99
-LDFLAGS=@LDFLAGS@ -L. -L.. -L$(srcdir)/../ -L/usr/local/lib
+CFLAGS=@CFLAGS@ -Wall -I.. -I$(srcdir)/.. -I$(srcdir) -I/usr/local/include -std=c99
+LDFLAGS=@LDFLAGS@
 LDLIBS=-lgetdns -lgetdns_ext_event @LIBS@
 PROGRAMS=example-all-functions example-simple-answers example-tree example-synchronous example-reverse
 
diff --git a/src/test/Makefile.in b/src/test/Makefile.in
index d730d714..cf59ec95 100644
--- a/src/test/Makefile.in
+++ b/src/test/Makefile.in
@@ -55,8 +55,8 @@ CHECK_EVENT_PROG=@CHECK_EVENT_PROG@
 CHECK_EV_PROG=@CHECK_EV_PROG@
 
 CC=@CC@
-CFLAGS=@CFLAGS@ -Wall -I$(srcdir)/ -I$(srcdir)/../ -I/usr/local/include -std=c99 $(cflags)
-LDFLAGS=@LDFLAGS@ -L. -L.. -L$(srcdir)/../ -L/usr/local/lib
+CFLAGS=@CFLAGS@ -Wall -I.. -I$(srcdir)/.. -I$(srcdir) -std=c99 $(cflags)
+LDFLAGS=@LDFLAGS@
 LDLIBS=-lgetdns @LIBS@ -lcheck
 PROGRAMS=tests_dict tests_list tests_stub_async tests_stub_sync check_getdns tests_dnssec $(CHECK_EV_PROG) $(CHECK_EVENT_PROG) $(CHECK_UV_PROG)