[q-lang-cvs] pd-qext Makefile,1.7,1.8

[Albert G. <ag...@us...>]

Update of /cvsroot/q-lang/pd-qext
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28760

Modified Files:
	Makefile 
Log Message:
allow separate setting for Pd install prefix

Index: Makefile
===================================================================
RCS file: /cvsroot/q-lang/pd-qext/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Makefile	6 Oct 2007 01:58:46 -0000	1.7
--- Makefile	9 Feb 2008 21:42:45 -0000	1.8
***************
*** 23,35 ****
  # (only for Linux/OSX)
  
! # XXXFIXME: This currently requires that both Pd and Q live under the same
! # prefix. Must do something more clever here sometime.
  
  #prefix=/usr
  prefix=/usr/local
  
  install:
! 	mkdir -p $(DESTDIR)$(prefix)/lib/pd/extra/q
! 	cp COPYING README Makefile q-help.pd q.c q.pd_* $(DESTDIR)$(prefix)/lib/pd/extra/q
  	mkdir -p $(DESTDIR)$(prefix)/share/q/lib
  	cp pd.q pdext.q $(DESTDIR)$(prefix)/share/q/lib
--- 23,39 ----
  # (only for Linux/OSX)
  
! # Make sure that this is set to the install prefix of the Q interpreter.
  
  #prefix=/usr
  prefix=/usr/local
  
+ # If Pd lives elsewhere, you can tell the install procedure by setting this
+ # variable accordingly.
+ 
+ pdprefix=$(prefix)
+ 
  install:
! 	mkdir -p $(DESTDIR)$(pdprefix)/lib/pd/extra/q
! 	cp COPYING README Makefile q-help.pd q.c q.pd_* $(DESTDIR)$(pdprefix)/lib/pd/extra/q
  	mkdir -p $(DESTDIR)$(prefix)/share/q/lib
  	cp pd.q pdext.q $(DESTDIR)$(prefix)/share/q/lib
***************
*** 38,42 ****
  
  uninstall:
! 	rm -rf $(DESTDIR)$(prefix)/lib/pd/extra/q
  	for x in pd.q pdext.q; do rm -f $(DESTDIR)$(prefix)/share/q/lib/$$x; done
  	rm -f $(DESTDIR)$(prefix)/lib/q/pd.*
--- 42,46 ----
  
  uninstall:
! 	rm -rf $(DESTDIR)$(pdprefix)/lib/pd/extra/q
  	for x in pd.q pdext.q; do rm -f $(DESTDIR)$(prefix)/share/q/lib/$$x; done
  	rm -f $(DESTDIR)$(prefix)/lib/q/pd.*