aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--abstractions/Makefile8
-rwxr-xr-xabstractions/Makefile.buildlayout57
-rw-r--r--extensions/Makefile2
-rw-r--r--extensions/Makefile.buildlayout53
4 files changed, 81 insertions, 39 deletions
diff --git a/abstractions/Makefile b/abstractions/Makefile
index 4478725c..a8ef72bd 100644
--- a/abstractions/Makefile
+++ b/abstractions/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)
include $(BUILDLAYOUT_DIR)/Makefile.buildlayout
@@ -27,7 +27,7 @@ all:
# clean up after everything is installed
final_setup:
- chmod -R ugo-w $(prefix)
+ chmod -R ugo-w $(pddocdir)
install: all $(objectsdir) $(helpdir) $(manualsdir) $(examplesdir) \
gyre_install keyboardkeys_install la_install-kitchen memento_install \
@@ -209,10 +209,10 @@ pixeltango_install:
--license "GNU GPL" \
--description "objects for creating visuals in a live performance setting"
install -d $(helpdir)/$(PIXELTANGO_NAME)
- install -p $(abstractions_src)/pixeltango/help/*.* \
+ install -p $(abstractions_src)/pixelTANGO/help/*.* \
$(helpdir)/$(PIXELTANGO_NAME)
install -d $(examplesdir)/$(PIXELTANGO_NAME)
- install -p $(abstractions_src)/pixeltango/Example-Patches/*.* \
+ install -p $(abstractions_src)/pixelTANGO/Example-Patches/*.* \
$(examplesdir)/$(PIXELTANGO_NAME)
install -d $(manualsdir)/$(PIXELTANGO_NAME)
install -p $(abstractions_src)/pixelTANGO/*.txt \
diff --git a/abstractions/Makefile.buildlayout b/abstractions/Makefile.buildlayout
index 4e386afc..5bc5f28b 100755
--- a/abstractions/Makefile.buildlayout
+++ b/abstractions/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)
#==============================================================================#
#
@@ -120,11 +140,11 @@ $(objectsdir): $(prefix)
PD_MAJOR_VERSION := $(shell grep 'Pd version' $(pd_src)/src/s_main.c | \
- sed 's/char pd_version\[\] = "Pd version \([0-9]\)\.[0-9]*[. TES-]*[0-9]*[0-9extndRC.-]*\\n";/\1/')
+ sed 's/char pd_version\[\] = "Pd version \([0-9]\)\.[0-9]*[. TES-]*[0-9]*[0-9extndRC.-]*.n";/\1/')
PD_MINOR_VERSION := $(shell grep 'Pd version' $(pd_src)/src/s_main.c | \
- sed 's/char pd_version\[\] = "Pd version [0-9]\.\([0-9]*\)[. TES-]*\([0-9]*\)[0-9extndRC.-]*\\n";/\1/')
+ sed 's/char pd_version\[\] = "Pd version [0-9]\.\([0-9]*\)[. TES-]*\([0-9]*\)[0-9extndRC.-]*.n";/\1/')
PD_BUGFIX_VERSION := $(shell grep 'Pd version' $(pd_src)/src/s_main.c | \
- sed 's/char pd_version\[\] = "Pd version [0-9]\.[0-9]*[. TES-]*\([0-9]*\)[0-9extndRC.-]*\\n";/\1/')
+ sed 's/char pd_version\[\] = "Pd version [0-9]\.[0-9]*[. TES-]*\([0-9]*\)[0-9extndRC.-]*.n";/\1/')
# the separators [.-] need to be the same as in s_main.c or the regexps break
PD_VERSION = $(PD_MAJOR_VERSION).$(PD_MINOR_VERSION).$(PD_BUGFIX_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:
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:
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-24 18:24:26 +0000