#!/bin/sh # # Created by: Vincent Stemen # Date: Wed Jul 7 00:37:49 CDT 2010 # This patch file is self applying. # It can be applied by directly executing it in the directory of the # file, being patched, or it can be applied the usual way # (e.g. patch < this_patch_file). # # This fixes Makefile.defs to properly handle $DESTDIR as a base # installation directory for packaging, etc. patch < $0 exit --- Makefile.defs.orig 2010-07-06 23:40:27 -0500 +++ Makefile.defs 2010-07-07 00:34:58 -0500 @@ -271,9 +271,8 @@ # Doxygen directory doxygen_dir=doc/doxygen - # install location -DESTDIR ?= $(LOCALBASE) -PREFIX ?= $(DESTDIR) +# install location +PREFIX ?= $(LOCALBASE) prefix = $(PREFIX) # install path is $(basedir) $(prefix) # example: @@ -281,7 +280,7 @@ # basedir=/tmp # prefix=/usr/local -BASEDIR ?= +BASEDIR ?= $(DESTDIR) basedir = $(BASEDIR) # install prefixes for various stuff cfg_prefix = $(basedir)$(prefix)