--- Makefile.orig	2010-08-30 13:49:42.022000015 +0200
+++ Makefile	2010-08-30 13:51:30.274000015 +0200
@@ -6,7 +6,8 @@
 default: all
 
 build ?= debug
-prefix ?= /usr/local
+prefix ?= /usr
+libprefix ?= $(prefix)/lib
 
 OBJDIR := build/$(build)
 GENDIR := build/generated
@@ -378,7 +379,7 @@
 	rm -rf build
 
 install: $(OBJDIR) $(GENDIR) $(MUPDF_LIB) $(APPS)
-	install -d $(prefix)/bin $(prefix)/lib $(prefix)/include
+	install -d $(prefix)/bin $(libprefix) $(prefix)/include
 	install $(APPS) $(prefix)/bin
-	install $(MUPDF_LIB) $(prefix)/lib
+	install $(MUPDF_LIB) $(libprefix)
 	install $(MUPDF_HDR) $(prefix)/include
--- Makerules.orig	2010-08-30 13:52:12.870000016 +0200
+++ Makerules	2010-08-30 13:54:08.731000014 +0200
@@ -4,8 +4,8 @@
 OS := $(OS:MINGW%=MINGW)
 
 CC ?= cc
-CFLAGS := -Ifitz -Imupdf -Wall
-LDFLAGS :=
+CFLAGS += -Ifitz -Imupdf
+LDFLAGS +=
 
 ifeq "$(build)" "debug"
 CFLAGS += -pipe -g
@@ -21,7 +21,7 @@
 
 ifeq "$(OS)" "Linux"
 SYS_FREETYPE_INC := `pkg-config --cflags freetype2`
-X11LIBS := -lX11 -lXext
+X11LIBS := `pkg-config --libs x11 xext`
 PDFVIEW_EXE = $(X11VIEW_EXE)
 endif