From 5ebae9f842a9d841758f79ee00a38e3b97bb633c Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <eighthave@users.sourceforge.net>
Date: Fri, 2 Dec 2005 19:12:41 +0000
Subject: generalized locations so that UNIX-style dir layout can also be used
 in addition to the Windows/MacOSX-style dir layout; fixed random bugs; added
 more the clean targets

svn path=/trunk/; revision=4120
---
 packages/Makefile.buildlayout | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

(limited to 'packages/Makefile.buildlayout')

diff --git a/packages/Makefile.buildlayout b/packages/Makefile.buildlayout
index 6a2dab6d..d485cfec 100644
--- a/packages/Makefile.buildlayout
+++ b/packages/Makefile.buildlayout
@@ -81,18 +81,20 @@ libdir = $(DESTDIR)$(prefix)/lib
 mandir = $(DESTDIR)$(prefix)/man
 
 ifeq ($(OS_NAME),darwin)
-  objectsdir = $(DESTDIR)$(prefix)/extra
-  pddocdir = $(DESTDIR)$(prefix)/doc
+  libpddir = $(DESTDIR)$(prefix)
+  libpdbindir = $(bindir)
   else
     ifeq ($(OS_NAME),win)
-      objectsdir = $(DESTDIR)$(prefix)/extra
-      pddocdir = $(DESTDIR)$(prefix)/doc
+      libpddir = $(DESTDIR)$(prefix)
+      libpdbindir = $(bindir)
     else
-      objectsdir = $(libdir)/pd/extra
-      pddocdir = $(libdir)/pd/doc
+      libpddir = $(libdir)/pd
+      libpdbindir = $(libpdbindir)/bin
     endif
 endif
 
+objectsdir = $(libpddir)/extra
+pddocdir = $(libpddir)/doc
 examplesdir = $(pddocdir)/examples
 helpdir = $(pddocdir)/5.reference
 manualsdir = $(pddocdir)/manuals
@@ -218,11 +220,17 @@ cruft_clean:
 	-rm -f -- *.*~
 	-rm -f -- Makefile~ Makefile.buildlayout~
 # sed replace litter
-	-rm -f -- */*/*/*/*.*.bak
-	-rm -f -- */*/*/*.*.bak
-	-rm -f -- */*/*.*.bak
-	-rm -f -- */*.*.bak
-	-rm -f -- *.*.bak
+	-rm -f -- */*/*/*/*.bak
+	-rm -f -- */*/*/*.bak
+	-rm -f -- */*/*.bak
+	-rm -f -- */*.bak
+	-rm -f -- *.bak
+# patching replace litter
+	-rm -f -- */*/*/*/*.rej
+	-rm -f -- */*/*/*.rej
+	-rm -f -- */*/*.rej
+	-rm -f -- */*.rej
+	-rm -f -- *.rej
 # autoconf cache
 	-rm -rf -- */*/*/*/autom4te.cache
 	-rm -rf -- */*/*/autom4te.cache
-- 
cgit v1.2.1