[SCM] faust/master: Simplified install-cleanup

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 337ca4823abbe2bd22e7a0c8e72780f77d041c75
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Wed Jan 4 10:44:23 2017 +0100

    Simplified install-cleanup
    
    using multiple post-install targets

diff --git a/debian/rules b/debian/rules
index 649eece..320d0e9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,6 @@ DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(cdbs_make_curdestdir)
 
 DEB_INSTALL_CHANGELOGS_ALL=WHATSNEW
 
-
 DEB_COPYRIGHT_CHECK_IGNORE_REGEX = \
         ^(.*\.(png|pdf|doctree|jar|xcuserstate|swc|ots)|debian/(changelog|copyright(|_hints|_newhints)))$
 
@@ -43,29 +42,24 @@ manpages:
 	debian/faust2man $(MANPAGEDIR) debian/faust2api.1
 manpageclean:
 	-rm -rf $(MANPAGEDIR)
-
-.PHONY: fixinstall
-fixinstall:
-	mkdir -p $(DEB_DESTDIR)/usr/share/faust/utils
-	-mv $(DEB_DESTDIR)/usr/bin/faustoptflags $(DEB_DESTDIR)/usr/share/faust/utils
-	-mv $(DEB_DESTDIR)/usr/bin/faustpath $(DEB_DESTDIR)/usr/share/faust/utils
-#	 remove source faustpath and faustoptflags from libexecdir
-	sed -e 's|^\( *\. \)faust|\1/usr/share/faust/utils/faust|' -i $(DEB_DESTDIR)/usr/bin/faust2*
-#	remove binary artifacts from to-be /usr/share
-	#-find $(CURDIR)/debian/$(cdbs_curpkg)/usr/share/faust/code "(" -name "*.a" -or -name "*.o" ")" -delete
-	rm -rf $(DEB_DESTDIR)/usr/share/faust/iOS/osclib/
-	-find $(DEB_DESTDIR)/usr/share/faust \
-		-name "*.cpp" -o -name "*.jucer" \
-		-exec chmod a-x {} +
-
 common-binary-arch:: manpages
 clean:: manpageclean
-binary-install/faust:: fixinstall
-install/faust-common:: fixinstall
 
+.PHONY: fix-faust fix-faust-common
+fix-faust-common:
+	# remove binary artifacts from to-be /usr/share
+	rm -rf $(DEB_DESTDIR_faust-common)/usr/share/faust/iOS/osclib/
+	# fix permissions
+	-find $(DEB_DESTDIR_faust-common)/usr/share/faust \
+		-name "*.cpp" -o -name "*.jucer" \
+		-exec chmod a-x {} +
+fix-faust:
+	# fix path for faustpath and faustoptflags
+	sed -e 's|^\( *\. \)faust|\1/usr/share/faust/utils/faust|' -i $(DEB_DESTDIR_faust)/usr/bin/faust2*
+binary-post-install/faust:: fix-faust
+binary-post-install/faust-common:: fix-faust-common
 
 .PHONY: missing-sources
-
 missing-sources: debian/missing-sources/jquery-1.4.2.js
 debian/missing-sources/jquery-1.4.2.js:
 	wget -O $@ https://raw.githubusercontent.com/jquery/jquery/1.4.2/jquery.js

-- 
faust packaging