--- Makefile.orig	2010-12-10 06:16:34.000000000 -0700
+++ Makefile	2011-02-28 11:03:44.000000000 -0700
@@ -14,13 +14,13 @@
 EMACS=emacs
 
 # Where local software is found
-prefix=/usr/local
+prefix=${PREFIX}
 
 # Where local lisp files go.
 lispdir   = $(prefix)/share/emacs/site-lisp
 
 # Where info files go.
-infodir = $(prefix)/share/info
+infodir = $(prefix)/info
 
 ##----------------------------------------------------------------------
 ## YOU MAY NEED TO EDIT THESE
@@ -164,7 +164,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/org%%PORTVERSION%%.info
 
 # Package Manager (ELPA)
 PKG_TAG = $(shell date +%Y%m%d)
@@ -200,7 +200,7 @@
 
 compile: $(ELCFILES0) $(ELCBFILES)
 
-install: install-lisp
+install: install-lisp install-info
 
 doc: doc/org.html doc/org.pdf doc/orgcard.pdf doc/orgcard_letter.pdf doc/orgguide.pdf doc/orgcard.txt
 
