faust (0.9.46-2) destdir

Summary

 examples/Makefile           |    7 +------
 examples/Makefile.qtcompile |    8 ++++----
 2 files changed, 5 insertions(+), 10 deletions(-)

    
download this patch

Patch contents

Description: Make sure the examples Makefile does not reference /usr/local
Author: Mario Lang <mlang@debian.org>
Bug-Debian: http://bugs.debian.org/660587
Forwarded: not-needed
Last-Update: 2012-03-24

Index: faust-0.9.46/examples/Makefile.qtcompile
===================================================================
--- faust-0.9.46.orig/examples/Makefile.qtcompile	2012-03-24 19:42:10.000000000 +0100
+++ faust-0.9.46/examples/Makefile.qtcompile	2012-03-24 22:05:22.095365434 +0100
@@ -31,7 +31,7 @@
 $(DEST)%.app : %.dsp
 	install -d $(TMP)
 	faust -a $(ARCH) $(VEC) $< -o $(TMP)/$<.cpp
-	cd $(TMP); qmake -project "$(DEFS)" "INCLUDEPATH+=/usr/local/lib/faust/" "INCLUDEPATH+=/usr/local/lib/faust/osclib" "LIBS+=$(LIB)" "HEADERS+=/usr/local/lib/faust/gui/faustqt.h" 
+	cd $(TMP); qmake -project "$(DEFS)" "INCLUDEPATH+=/usr/lib/faust/" "INCLUDEPATH+=/usr/lib/faust/osclib" "LIBS+=$(LIB)" "HEADERS+=/usr/lib/faust/gui/faustqt.h"
 	cd $(TMP); qmake $(SPEC)
 	make -C $(TMP)
 	rm -rf $@
@@ -40,9 +40,9 @@
 
 
 ### Linux
-hdir1 := $(wildcard /usr/local/lib/faust/gui/faustqt.h)
+hdir1 := $(wildcard /usr/lib/faust/gui/faustqt.h)
 hdir2 := $(wildcard /usr/share/faust/faustqt.h)
-hdir3 := $(wildcard /usr/local/lib/faust/faustqt.h)
+hdir3 := $(wildcard /usr/lib/faust/faustqt.h)
 hdir23 := $(if $(hdir2),$(dir $(hdir2)),$(dir $(hdir3)))
 hdir := $(if $(hdir1),$(dir $(hdir1)),$(hdir23))
 qm4 := $(shell which qmake-qt4)
@@ -52,7 +52,7 @@
 	rm -rf $(TMP)
 	install -d $(TMP)
 	faust -a $(ARCH) $(VEC) $< -o $(TMP)/$<.cpp
-	cd $(TMP); $(qm) -project "$(DEFS)" "INCLUDEPATH+=/usr/local/lib/faust/" "INCLUDEPATH+=/usr/local/lib/faust/osclib" "LIBS+=$(LIB)" "HEADERS+=$(hdir)faustqt.h" 
+	cd $(TMP); $(qm) -project "$(DEFS)" "INCLUDEPATH+=/usr/lib/faust/" "INCLUDEPATH+=/usr/lib/faust/osclib" "LIBS+=$(LIB)" "HEADERS+=$(hdir)faustqt.h"
 	cd $(TMP); $(qm) $(SPEC)
 	make -C $(TMP)
 	mv $(TMP)/$(<:.dsp=) $@
Index: faust-0.9.46/examples/Makefile
===================================================================
--- faust-0.9.46.orig/examples/Makefile	2012-03-24 21:12:03.834424962 +0100
+++ faust-0.9.46/examples/Makefile	2012-03-24 22:04:10.295648013 +0100
@@ -1,10 +1,5 @@
 # Directory containing Faust .lib and .cpp architecture files:
-ck1 := /opt/local/lib/faust/music.lib
-ck2 := /usr/local/lib/faust/music.lib
-ck3 := $(FAUST_LIB_PATH)/faust/music.lib
-LIB := $(if $(wildcard $(ck1)),/opt/local/lib,"")
-LIB := $(if $(wildcard $(ck2)),/usr/local/lib,$(LIB))
-LIB := $(if $(wildcard $(ck3)),$(FAUST_LIB_PATH),$(LIB))
+LIB := /usr/lib
 
 ifeq ($(OSC),1)
  OSCCTRL := -DOSCCTRL -I$(LIB)/faust/osclib