- finally got a Linux Pd-extended release out, RC5

- built a tar.bz2 package maker with a generated Makefile for installing and
  uninstalling

- switched all Makefiles to follow GNU $(DESTDIR)/$(prefix) standards

svn path=/trunk/; revision=4065

2 files changed, 38 insertions, 17 deletions

diff --git a/extensions/Makefile b/extensions/Makefile
index ba794fe2..4be10189 100644
--- a/extensions/Makefile
+++ b/extensions/Makefile
@@ -11,7 +11,7 @@ CWD := $(shell pwd)
 
 # these are designed to be overridden by the packages/Makefile
 cvs_root_dir = $(CWD)/..
-prefix = build
+DESTDIR = $(CWD)/build/
 BUILDLAYOUT_DIR = $(CWD)
 
 # default target
diff --git a/extensions/Makefile.buildlayout b/extensions/Makefile.buildlayout
index 2ac3ff16..5bc5f28b 100644
--- a/extensions/Makefile.buildlayout
+++ b/extensions/Makefile.buildlayout
@@ -40,6 +40,7 @@ UNAME := $(shell uname -s)
 ifeq ($(UNAME),Linux)
   OS_NAME = linux
   EXTENSION = pd_linux
+  prefix = /usr/local
 else 
   ifeq ($(UNAME),Darwin)
     OS_NAME = darwin
@@ -75,13 +76,25 @@ scripts_src = $(cvs_root_dir)/scripts
 
 
 # destinations
+bindir = $(DESTDIR)$(prefix)/bin
+includedir = $(DESTDIR)$(prefix)/include
+libdir = $(DESTDIR)$(prefix)/lib
+mandir = $(DESTDIR)$(prefix)/man
+
+ifeq ($(OS_NAME),darwin)
+  objectsdir = $(DESTDIR)$(prefix)/extra
+  pddocdir = $(DESTDIR)$(prefix)/doc
+  else
+    ifeq ($(OS_NAME),win)
+      objectsdir = $(DESTDIR)$(prefix)/extra
+      pddocdir = $(DESTDIR)$(prefix)/doc
+    else
+      objectsdir = $(libdir)/pd/extra
+      pddocdir = $(libdir)/pd/doc
+    endif
+endif
+
 examplesdir = $(pddocdir)/examples
-bindir = $(prefix)/bin
-pddocdir = $(prefix)/doc
-includedir = $(prefix)/include
-libdir = $(prefix)/lib
-mandir = $(prefix)/man
-objectsdir = $(prefix)/extra
 helpdir = $(pddocdir)/5.reference
 manualsdir = $(pddocdir)/manuals
 
@@ -93,24 +106,31 @@ manualsdir = $(pddocdir)/manuals
 #==============================================================================#
 
 # first make sure that the directory structure is setup
-$(prefix):
-	install -d $(prefix)
+$(DESTDIR):
+	install -d $(DESTDIR)
+
+$(bindir): $(DESTDIR)
+	install -d $(bindir)
 
-$(examplesdir):  $(prefix)
+$(examplesdir): $(DESTDIR)
 	install -d $(examplesdir)
 
-$(pddocdir): $(prefix)
+$(includedir): $(DESTDIR)
+	install -d $(includedir)
+
+$(pddocdir): $(DESTDIR)
 	install -d $(pddocdir)
 
-$(helpdir): $(prefix)
+$(helpdir): $(DESTDIR)
 	install -d $(helpdir)
 
-$(manualsdir): $(prefix)
+$(manualsdir): $(DESTDIR)
 	install -d $(manualsdir)
 
-$(objectsdir): $(prefix)
+$(objectsdir): $(DESTDIR)
 	install -d $(objectsdir)
 
+installdirs: $(DESTDIR) $(bindir) $(examplesdir) $(pddocdir) $(includedir) $(helpdir) $(manualsdir) $(objectsdir)
 
 #==============================================================================#
 #
@@ -130,7 +150,7 @@ PD_VERSION = $(PD_MAJOR_VERSION).$(PD_MINOR_VERSION).$(PD_BUGFIX_VERSION)
 
 
 # release version for this distro
-PACKAGE_VERSION = extended-RC6
+PACKAGE_VERSION = extended-RC5
 PACKAGE_NAME = Pd-$(PD_VERSION)-$(PACKAGE_VERSION)
 
 
@@ -184,9 +204,10 @@ objects_clean:
 
 install_clean: applications_clean help_clean manuals_clean objects_clean
 	-rmdir $(pddocdir)
-	-rmdir $(prefix)
+	-rmdir $(DESTDIR)$(prefix)
+	-rmdir $(DESTDIR)
 	@echo " "
-	@echo "Build destination cleaned: $(prefix)"
+	@echo "Build destination cleaned: $(DESTDIR)"
 
 
 cruft_clean: