Update of /cvsroot/pure-data/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1792
Modified Files: Makefile Makefile.buildlayout Log Message:
- 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
Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/doc/Makefile,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Makefile 27 Nov 2005 04:56:31 -0000 1.11 --- Makefile 28 Nov 2005 06:53:35 -0000 1.12 *************** *** 12,16 **** # these are designed to be overridden by the packages/Makefile cvs_root_dir = $(CWD)/.. ! prefix = build BUILDLAYOUT_DIR = $(CWD)
--- 12,16 ---- # these are designed to be overridden by the packages/Makefile cvs_root_dir = $(CWD)/.. ! DESTDIR = $(CWD)/build/ BUILDLAYOUT_DIR = $(CWD)
Index: Makefile.buildlayout =================================================================== RCS file: /cvsroot/pure-data/doc/Makefile.buildlayout,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile.buildlayout 26 Nov 2005 04:19:27 -0000 1.5 --- Makefile.buildlayout 28 Nov 2005 06:53:35 -0000 1.6 *************** *** 41,44 **** --- 41,45 ---- OS_NAME = linux EXTENSION = pd_linux + prefix = /usr/local else ifeq ($(UNAME),Darwin) *************** *** 76,86 ****
# destinations 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 --- 77,99 ----
# 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 helpdir = $(pddocdir)/5.reference manualsdir = $(pddocdir)/manuals *************** *** 94,115 ****
# first make sure that the directory structure is setup ! $(prefix): ! install -d $(prefix)
! $(examplesdir): $(prefix) install -d $(examplesdir)
! $(pddocdir): $(prefix) install -d $(pddocdir)
! $(helpdir): $(prefix) install -d $(helpdir)
! $(manualsdir): $(prefix) install -d $(manualsdir)
! $(objectsdir): $(prefix) install -d $(objectsdir)
#==============================================================================# --- 107,135 ----
# first make sure that the directory structure is setup ! $(DESTDIR): ! install -d $(DESTDIR)
! $(bindir): $(DESTDIR) ! install -d $(bindir) ! ! $(examplesdir): $(DESTDIR) install -d $(examplesdir)
! $(includedir): $(DESTDIR) ! install -d $(includedir) ! ! $(pddocdir): $(DESTDIR) install -d $(pddocdir)
! $(helpdir): $(DESTDIR) install -d $(helpdir)
! $(manualsdir): $(DESTDIR) install -d $(manualsdir)
! $(objectsdir): $(DESTDIR) install -d $(objectsdir)
+ installdirs: $(DESTDIR) $(bindir) $(examplesdir) $(pddocdir) $(includedir) $(helpdir) $(manualsdir) $(objectsdir)
#==============================================================================# *************** *** 121,129 ****
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/') 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/') 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/') # 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) --- 141,149 ----
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/') 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/') 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/') # 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) *************** *** 185,191 **** install_clean: applications_clean help_clean manuals_clean objects_clean -rmdir $(pddocdir) ! -rmdir $(prefix) @echo " " ! @echo "Build destination cleaned: $(prefix)"
--- 205,212 ---- install_clean: applications_clean help_clean manuals_clean objects_clean -rmdir $(pddocdir) ! -rmdir $(DESTDIR)$(prefix) ! -rmdir $(DESTDIR) @echo " " ! @echo "Build destination cleaned: $(DESTDIR)"