--- Makefile.orig	2012-05-26 05:12:51.000000000 +0800
+++ Makefile	2012-06-11 09:31:16.000000000 +0800
@@ -14,7 +14,7 @@
 EMACS=emacs
 
 # Where local software is found
-prefix=/usr/local
+prefix=${PREFIX}
 
 # Where local lisp files go
 lispdir   = $(prefix)/share/emacs/site-lisp
@@ -22,10 +22,10 @@
 # Where data files go
 # $(datadir) contains auxiliary files for use with ODT exporter.
 # See comments under DATAFILES.
-datadir = $(prefix)/share/emacs/etc
+datadir = $(prefix)/share/emacs/etc/org-mode
 
 # Where info files go
-infodir = $(prefix)/share/info
+infodir = $(prefix)/info
 
 ##----------------------------------------------------------------------
 ## YOU MAY NEED TO EDIT THESE
@@ -181,7 +181,7 @@
               doc/orgguide.texi doc/orgguide.pdf
 CARDFILES   = doc/orgcard.tex doc/orgcard.pdf doc/orgcard_letter.pdf
 TEXIFILES   = doc/org.texi
-INFOFILES   = doc/org
+INFOFILES   = doc/org7.8.11.info
 
 # etc/styles contains OpenDocument style files.  These files *must* be
 # installed for the ODT exporter to function.  These files are
@@ -238,7 +238,7 @@
 
 compile: $(ELCFILES0) $(ELCBFILES)
 
-install: install-lisp install-data
+install: install-lisp install-data install-info
 
 doc: doc/org.html doc/org.pdf doc/orgcard.pdf doc/orgcard_letter.pdf doc/orgguide.pdf doc/orgcard.txt