From f10c28b0be80e10c707a555bdc72b2e4a468cf04 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <eighthave@users.sourceforge.net>
Date: Tue, 9 Jun 2009 18:16:50 +0000
Subject: fixed up libpdir variable so it works properly with DESTDIR and the
 new DESTDIR support in pd/src/makefile.in

svn path=/trunk/; revision=11725
---
 packages/Makefile.buildlayout | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'packages')

diff --git a/packages/Makefile.buildlayout b/packages/Makefile.buildlayout
index dd4a00e6..1d98800a 100644
--- a/packages/Makefile.buildlayout
+++ b/packages/Makefile.buildlayout
@@ -107,15 +107,15 @@ scripts_src = $(cvs_root_dir)/scripts
 # destinations
 bindir = $(DESTDIR)$(prefix)/bin
 includedir = $(DESTDIR)$(prefix)/include
-libdir = $(DESTDIR)$(prefix)/lib
+libdir = $(prefix)/lib
 mandir = $(DESTDIR)$(prefix)/man
 
 ifeq ($(OS_NAME),darwin)
-  libpddir = $(DESTDIR)$(prefix)
+  libpddir = $(prefix)
   libpdbindir = $(bindir)
   else
     ifeq ($(OS_NAME),windows)
-      libpddir = $(DESTDIR)$(prefix)
+      libpddir = $(prefix)
       libpdbindir = $(bindir)
     else
       libpddir = $(libdir)/pd
@@ -123,8 +123,8 @@ ifeq ($(OS_NAME),darwin)
     endif
 endif
 
-objectsdir = $(libpddir)/extra
-pddocdir = $(libpddir)/doc
+objectsdir = $(DESTDIR)$(libpddir)/extra
+pddocdir = $(DESTDIR)$(libpddir)/doc
 examplesdir = $(pddocdir)/examples
 helpdir = $(pddocdir)/5.reference
 manualsdir = $(pddocdir)/manuals
-- 
cgit v1.2.1