Index: Makefile.in
===================================================================
--- Makefile.in.orig	2009-02-09 10:58:53.000000000 +0100
+++ Makefile.in	2010-09-07 19:08:40.912655993 +0200
@@ -87,9 +87,13 @@ install-strip:
 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) $(STRIP)' install
 
 installdirs:
-	$(MKDIR) $(libdir) $(bindir) $(sbindir) $(includedir) $(sysconfdir); \
+	$(INSTALL_DIR) $(DESTDIR)$(libdir)
+	$(INSTALL_DIR) $(DESTDIR)$(bindir)
+	$(INSTALL_DIR) $(DESTDIR)$(sbindir)
+	$(INSTALL_DIR) $(DESTDIR)$(includedir)
+	$(INSTALL_DIR) $(DESTDIR)$(sysconfdir); \
 	if test "x$(ELISP)" != "x" ; then \
-		$(MKDIR) $(lispdir) ; \
+		$(MKDIR) $(DESTDIR)$(lispdir) ; \
 	fi
 
 ### GENERIC
Index: Makefile.include.in
===================================================================
--- Makefile.include.in.orig	2009-02-09 10:58:53.000000000 +0100
+++ Makefile.include.in	2010-09-07 19:03:04.962483820 +0200
@@ -43,6 +43,7 @@ YACC              = @YACC@
 INSTALL           = @INSTALL@
 INSTALL_PROGRAM   = @INSTALL_PROGRAM@
 INSTALL_DATA      = @INSTALL_DATA@
+INSTALL_DIR       = @INSTALL@ -d
 LN_S              = @LN_S@
 EMACS             = @EMACS@
 ELISP             = @ELISP@
Index: doc/Makefile.in
===================================================================
--- doc/Makefile.in.orig	2009-02-09 10:58:53.000000000 +0100
+++ doc/Makefile.in	2010-09-07 19:09:37.506283144 +0200
@@ -111,29 +111,18 @@ gpmdoc.ps:	gpm.ps
 # install & uninstall
 
 installdirs:	
-	$(MKDIR) $(man1dir) $(man7dir) $(man8dir) $(infodir)	
+	$(INSTALL_DIR) $(DESTDIR)$(man1dir)
+	$(INSTALL_DIR) $(DESTDIR)$(man7dir)
+	$(INSTALL_DIR) $(DESTDIR)$(man8dir)
+	$(INSTALL_DIR) $(DESTDIR)$(infodir)
 
 install:	all installdirs
-	$(INSTALL_DATA) -m 644 mev.1          $(man1dir)
-	$(INSTALL_DATA) -m 644 mouse-test.1   $(man1dir)
-	$(INSTALL_DATA) -m 644 gpm-root.1     $(man1dir)
-	$(INSTALL_DATA) -m 644 gpm-types.7    $(man7dir)
-	$(INSTALL_DATA) -m 644 gpm.8          $(man8dir)
-	$(INSTALL_DATA) -m 644 $(srcdir)/gpm.info       $(infodir)
-	# Use install-info if available
-	-if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
-	  if [ -f $(infodir)/dir ] ; then \
-		install-info --dir-file=$(infodir)/dir $(infodir)/gpm.info; \
-	  fi; \
-	fi
-	#itz Sat Dec 26 23:21:05 PST 1998
-	#i keep all my infopages compressed and i'm tired to do it by
-	#hand, so check if there are any compressed pages and do this
-	#one too
-	-ls $(infodir)/*[-.]info.gz >/dev/null 2>&1 \
-		&& gzip -f $(infodir)/gpm.info
-	# Hmm.... shouldn't man pages be compressed too?
-   # maybe they should, but at least at my system they are not.
+	$(INSTALL_DATA) -m 644 mev.1          $(DESTDIR)$(man1dir)
+	$(INSTALL_DATA) -m 644 mouse-test.1   $(DESTDIR)$(man1dir)
+	$(INSTALL_DATA) -m 644 gpm-root.1     $(DESTDIR)$(man1dir)
+	$(INSTALL_DATA) -m 644 gpm-types.7    $(DESTDIR)$(man7dir)
+	$(INSTALL_DATA) -m 644 gpm.8          $(DESTDIR)$(man8dir)
+	$(INSTALL_DATA) -m 644 $(srcdir)/gpm.info       $(DESTDIR)$(infodir)
 
 # This potentially leaves around cached manpages,
 # e.g. /var/cache/man/cat1/mev.1.gz.  Deleting these is not our job,
Index: src/Makefile.in
===================================================================
--- src/Makefile.in.orig	2009-02-09 10:58:53.000000000 +0100
+++ src/Makefile.in	2010-09-07 19:07:57.361560078 +0200
@@ -104,15 +104,16 @@ check:	all
 installdirs:
 
 install:	check 
-	$(INSTALL_PROGRAM) gpm $(sbindir)/gpm
-	$(INSTALL_DATA) -m 644 lib/libgpm.a $(libdir)/libgpm.a
-	$(INSTALL_DATA) -m 644 $(srcdir)/headers/gpm.h $(includedir)/gpm.h
+	$(INSTALL_PROGRAM) gpm $(DESTDIR)$(sbindir)/gpm
+	$(INSTALL_DATA) -m 644 lib/libgpm.a $(DESTDIR)$(libdir)/libgpm.a
+	$(INSTALL_DATA) -m 644 $(srcdir)/headers/gpm.h $(DESTDIR)$(includedir)/gpm.h
 	# POSIX requires the range of a for loop be nonempty and Bash
 	# 2.x goes along; unfortunately that means an additional
 	# headache in cases like this
 	if test "x@SHLIB@" != "x" ; then \
-		$(INSTALL_DATA) -m 644 lib/libgpm.so.@abi_full@ $(libdir)/libgpm.so.@abi_full@	;	\
-		cd $(libdir) && $(LN_S) -f libgpm.so.@abi_full@ libgpm.so.@abi_lev@ 					;	\
+		$(INSTALL_DATA) -m 755 lib/libgpm.so.@abi_full@ $(DESTDIR)$(libdir)/libgpm.so.@abi_full@ ;	\
+		cd $(DESTDIR)$(libdir) && $(LN_S) -f libgpm.so.@abi_full@ libgpm.so ;	\
+                cd $(DESTDIR)$(libdir) && $(LN_S) -f libgpm.so.@abi_full@ libgpm.so.@abi_lev@;	\
       echo "WARNING: We installed a lib, you should now call ldconfig" 						; 	\
       echo "f.i.: ldconfig -n -l $(libdir)/libgpm.so.@abi_full@" 								;	\
       echo "Or to update everything just type ldconfig"											;	\
@@ -122,7 +123,7 @@ install:	check
 
    # prog/
 	for i in $(PROG); do \
-		$(INSTALL_PROGRAM) $$i $(bindir)/`echo $$i | sed 's,prog/,,'` ;\
+		$(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir)/`echo $$i | sed 's,prog/,,'` ;\
 	done
 
 install-strip: