aboutsummaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorHans-Christoph Steiner <eighthave@users.sourceforge.net>2009-06-09 18:16:50 +0000
committerHans-Christoph Steiner <eighthave@users.sourceforge.net>2009-06-09 18:16:50 +0000
commitf10c28b0be80e10c707a555bdc72b2e4a468cf04 (patch)
tree29c2587df1889f9a168175bebc21bc6eccf69e68 /packages
parente099729995f67ede6122befd2fca2a48becef032 (diff)
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
Diffstat (limited to 'packages')
-rw-r--r--packages/Makefile.buildlayout10
1 files changed, 5 insertions, 5 deletions
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