From 4569f399febf32452425c78c005d02e5354b25b2 Mon Sep 17 00:00:00 2001
From: Sojourner Truth <jon.w.wilkes@gmail.com>
Date: Sun, 19 Jun 2016 22:46:58 -0400
Subject: [PATCH] port agraef's commit from Pd-l2ork: Make 'tar_em_up.sh -B -n'
 do the right thing, by moving the extra staging done by 'make deb' into a
 separate 'debstage' target. commit 73bf25e1dd5bd2dd37e04e7e163855d440542e43

---
 l2ork_addons/tar_em_up.sh    |  8 +++++---
 packages/linux_make/Makefile | 12 +++++++-----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/l2ork_addons/tar_em_up.sh b/l2ork_addons/tar_em_up.sh
index b535a64e3..edd65ca50 100755
--- a/l2ork_addons/tar_em_up.sh
+++ b/l2ork_addons/tar_em_up.sh
@@ -367,11 +367,11 @@ then
 	cd ../../
 	echo "done with l2ork addons."
 	cd ../
-	if [ $pkg -gt 0 ]; then
 	# finish install
 	cd packages/linux_make
-	echo "tar full installer..."
 	rm -f build/usr/local/lib/pd
+	if [ $pkg -gt 0 ]; then
+	echo "tar full installer..."
 	if [ $deb -gt 0 ]
 	then
 		cd build/
@@ -390,8 +390,10 @@ then
 		#mv build/Pd*bz2 ../../../Pd-l2ork-full-`uname -m`-`date +%Y%m%d`.tar.bz2
 		mv -f build/pd*bz2 ../../..
 	fi
-	cd ../../
+	elif [ $deb -gt 0 ]; then
+		make debstage prefix=$inst_dir
 	fi
+	cd ../../ 
 fi
 
 if [ $addon -eq 1 ]
diff --git a/packages/linux_make/Makefile b/packages/linux_make/Makefile
index 0d91750a5..f0a66176a 100644
--- a/packages/linux_make/Makefile
+++ b/packages/linux_make/Makefile
@@ -83,10 +83,8 @@ tarbz2: installer_settings installer_makefile installer_readme
 		tar cjf $(PACKAGE_NAME).tar.bz2  $(PACKAGE_NAME)
 	mv $(DESTDIR)$(PACKAGE_NAME) $(DESTDIR)$(prefix)
 
-
-deb: DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-deb: DEB_PD_VERSION := $(shell echo $(PD_VERSION) | sed 's|\(.*\)-l2ork-\(.*\)|\1-\2|')
-deb: $(bindir)
+# Any special staging for the "Burrito Supreme" installer goes here.
+debstage: $(bindir)
 # add K12 mode
 	cp -rf ../../l2ork_addons/K12/ $(DESTDIR)$(libpddir)/extra/
 # add arduino library
@@ -144,7 +142,11 @@ deb: $(bindir)
 		$(DESTDIR)/usr/share/emacs/site-lisp/
 # Pd-related scripts
 	#install -p $(scripts_src)/pd-diff $(DESTDIR)$(bindir)
-	install -p $(scripts_src)/config-switcher.sh $(DESTDIR)$(bindir)
+	#install -p $(scripts_src)/config-switcher.sh $(DESTDIR)$(bindir)
+
+deb: DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+deb: DEB_PD_VERSION := $(shell echo $(PD_VERSION) | sed 's|\(.*\)-l2ork-\(.*\)|\1-\2|')
+deb: debstage
 # delete these since they are provided by the 'puredata-utils' and 'cyclist' package
 	rm -f $(DESTDIR)$(bindir)/pdsend
 	rm -f $(DESTDIR)$(bindir)/pdreceive
-- 
GitLab