diff --git a/configure.in b/configure.in
index 9fd0cb7..c76616c 100644
--- a/configure.in
+++ b/configure.in
@@ -23,19 +23,19 @@ AC_SUBST(JACK_RELEASE)
 
 AM_INIT_AUTOMAKE(jack,${JACK_VERSION})
 
-CFLAGS="-g -Wall -I.. -D_REENTRANT"
+AM_PATH_GLIB(1.0.0,,[AC_MSG_ERROR([*** JACK requires glib, but it doesn't appear to be installed])])
+
+CFLAGS="-g -Wall -D_REENTRANT"
 OPT_CFLAGS="-D_REENTRANT -O6 -Wall -fomit-frame-pointer -ffast-math -fstrength-reduce -funroll-loops -fmove-all-movables"
 
-AM_PATH_GLIB(1.0.0,,[AC_MSG_ERROR([*** JACK requires glib, but it doesn't appear to be installed])])
+AC_ARG_ENABLE(optimize,
+     [  --enable-optimize       ask the compiler for its best optimizations.],
+     [ if test "x$enable_optimize" != "xno" ; then CFLAGS="$OPT_CFLAGS" ; fi ])
 
 CFLAGS="$CFLAGS $GLIB_CFLAGS"
 CXXFLAGS="$CFLAGS"
 LIBS="$LIBS $GLIB_LIBS"
 
-AC_ARG_ENABLE(optimize,
-     [  --enable-optimize       ask the compiler for its best optimizations.],
-     [ if test "x$enable_optimize" != "xno" ; then CFLAGS="$CFLAGS $OPT_CFLAGS" ; fi ])
-
 XTRA=""
 
 AC_ARG_ENABLE(fltk-client,
diff --git a/doc/Makefile b/doc/Makefile
index 37fbfe3..85c6ee6 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -28,6 +28,10 @@ fullname = $(shell awk -F: '/$(user)/ { print $$5}' /etc/passwd)
 .PHONY: manual
 .PHONY: upload
 
+all: html
+install:
+	@:
+
 html: $(HTML-FILES)
 
 upload: build-updir