From 8d40c6e367c09c948471577b04678ff31a08970f Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <eighthave@users.sourceforge.net>
Date: Mon, 21 Sep 2009 05:02:56 +0000
Subject: setup separate pd_install targets, one for each the old and new build
 systems

svn path=/trunk/; revision=12419
---
 packages/Makefile | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'packages')

diff --git a/packages/Makefile b/packages/Makefile
index 5db46a69..45c86b20 100644
--- a/packages/Makefile
+++ b/packages/Makefile
@@ -125,13 +125,21 @@ PD_BUILD_FLAGS =
 HAVE_AUTOGEN_SH := $(wildcard $(pd_src)/autogen.sh)
 # test for the new build system
 ifeq (autogen.sh, $(findstring autogen.sh,$(HAVE_AUTOGEN_SH)))
+#----------------------------------------------------------------------------#
 # new autotools build system
 pd:
 	cd $(pd_src) \
 		&& ./autogen.sh \
 		&& ./configure $(PD_CONFIGURE_FLAGS) \
 		&& make $(DEST_PATHS) $(PD_BUILD_FLAGS)
+
+PD_NAME=Pd
+pd_install: pd
+	$(MAKE) -C $(pd_src) $(DEST_PATHS) $(PD_BUILD_FLAGS) install
+	install -d $(DESTDIR)$(manualsdir)/$(PD_NAME)
+	install -p $(pd_src)/src/notes.txt $(DESTDIR)$(manualsdir)/$(PD_NAME)
 else
+#----------------------------------------------------------------------------#
 # old build system
 PD_AUTOCONF = autoconf
 $(pd_src)/src/configure: $(pd_src)/src/configure.in
@@ -150,6 +158,12 @@ pd: $(pd_src)/src/configure
 		make OPT_CFLAGS="" depend  && \
 		make $(DEST_PATHS) $(PD_BUILD_FLAGS)
 
+PD_NAME=Pd
+pd_install: pd
+	$(MAKE) -C $(pd_src)/src $(DEST_PATHS) $(PD_BUILD_FLAGS) install
+	install -d $(DESTDIR)$(manualsdir)/$(PD_NAME)
+	install -p $(pd_src)/src/notes.txt $(DESTDIR)$(manualsdir)/$(PD_NAME)
+
 endif
 
 
@@ -267,14 +281,6 @@ endif
 		$(DESTDIR)$(prefix)/gripd
 
 
-#------------------------------------------------------------------------------
-# pd_install
-PD_NAME=Pd
-pd_install: pd
-	$(MAKE) -C $(pd_src)/src $(DEST_PATHS) $(PD_BUILD_FLAGS) install
-	install -d $(DESTDIR)$(manualsdir)/$(PD_NAME)
-	install -p $(pd_src)/src/notes.txt $(DESTDIR)$(manualsdir)/$(PD_NAME)
-
 #==============================================================================#
 #
 # GENERATE TEXT FILES FOR PACKAGE
-- 
cgit v1.2.1