Commit 4569f399 authored by Jonathan Wilkes's avatar Jonathan Wilkes
Browse files

port agraef's commit from Pd-l2ork: Make 'tar_em_up.sh -B -n' do the right...

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
parent d8688c75
...@@ -367,11 +367,11 @@ then ...@@ -367,11 +367,11 @@ then
cd ../../ cd ../../
echo "done with l2ork addons." echo "done with l2ork addons."
cd ../ cd ../
if [ $pkg -gt 0 ]; then
# finish install # finish install
cd packages/linux_make cd packages/linux_make
echo "tar full installer..."
rm -f build/usr/local/lib/pd rm -f build/usr/local/lib/pd
if [ $pkg -gt 0 ]; then
echo "tar full installer..."
if [ $deb -gt 0 ] if [ $deb -gt 0 ]
then then
cd build/ cd build/
...@@ -390,8 +390,10 @@ then ...@@ -390,8 +390,10 @@ then
#mv build/Pd*bz2 ../../../Pd-l2ork-full-`uname -m`-`date +%Y%m%d`.tar.bz2 #mv build/Pd*bz2 ../../../Pd-l2ork-full-`uname -m`-`date +%Y%m%d`.tar.bz2
mv -f build/pd*bz2 ../../.. mv -f build/pd*bz2 ../../..
fi fi
cd ../../ elif [ $deb -gt 0 ]; then
make debstage prefix=$inst_dir
fi fi
cd ../../
fi fi
if [ $addon -eq 1 ] if [ $addon -eq 1 ]
......
...@@ -83,10 +83,8 @@ tarbz2: installer_settings installer_makefile installer_readme ...@@ -83,10 +83,8 @@ tarbz2: installer_settings installer_makefile installer_readme
tar cjf $(PACKAGE_NAME).tar.bz2 $(PACKAGE_NAME) tar cjf $(PACKAGE_NAME).tar.bz2 $(PACKAGE_NAME)
mv $(DESTDIR)$(PACKAGE_NAME) $(DESTDIR)$(prefix) mv $(DESTDIR)$(PACKAGE_NAME) $(DESTDIR)$(prefix)
# Any special staging for the "Burrito Supreme" installer goes here.
deb: DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH) debstage: $(bindir)
deb: DEB_PD_VERSION := $(shell echo $(PD_VERSION) | sed 's|\(.*\)-l2ork-\(.*\)|\1-\2|')
deb: $(bindir)
# add K12 mode # add K12 mode
cp -rf ../../l2ork_addons/K12/ $(DESTDIR)$(libpddir)/extra/ cp -rf ../../l2ork_addons/K12/ $(DESTDIR)$(libpddir)/extra/
# add arduino library # add arduino library
...@@ -144,7 +142,11 @@ deb: $(bindir) ...@@ -144,7 +142,11 @@ deb: $(bindir)
$(DESTDIR)/usr/share/emacs/site-lisp/ $(DESTDIR)/usr/share/emacs/site-lisp/
# Pd-related scripts # Pd-related scripts
#install -p $(scripts_src)/pd-diff $(DESTDIR)$(bindir) #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 # delete these since they are provided by the 'puredata-utils' and 'cyclist' package
rm -f $(DESTDIR)$(bindir)/pdsend rm -f $(DESTDIR)$(bindir)/pdsend
rm -f $(DESTDIR)$(bindir)/pdreceive rm -f $(DESTDIR)$(bindir)/pdreceive
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment