--- xsnap-1.5.6/Imakefile.org	2009-09-23 08:51:44.000000000 +0200
+++ xsnap-1.5.6/Imakefile	2010-02-08 12:50:20.000000000 +0100
@@ -1,6 +1,6 @@
-   XPM_INCLUDES = -I/usr/X11R6/include/X11
-         XPMLIB = -L/usr/X11R6/lib -lXpm
-         PNGLIB = -lpng
+   XPM_INCLUDES = 
+         XPMLIB = $(shell pkg-config --libs xpm)
+         PNGLIB = $(shell pkg-config --libs libpng)
         JPEGLIB = -ljpeg
 /*
    XPM_INCLUDES = -I/opt/xpm/include/X11
@@ -25,13 +25,13 @@
 ComplexProgramTarget(xsnap)
 
 all::
-	cd po ; make
+	cd po ; $(MAKE)
 
 install::
 	cp -f xsnap_ocr $(DESTDIR)/$(BINDIR)
-	cd po ; make install
+	cd po ; $(MAKE) install
 
 clean::
-	cd po ; make clean
+	cd po ; $(MAKE) clean
 	rm -f *stamp