Commit c1c71a88 authored by Albert Gräf's avatar Albert Gräf
Browse files

Installer bugfixes, remove misleading debug message.

parent 52f9741c
...@@ -110,7 +110,7 @@ fi ...@@ -110,7 +110,7 @@ fi
# Fetch the nw.js binary if we haven't already. We want to fetch it even # Fetch the nw.js binary if we haven't already. We want to fetch it even
# for building with no libs, so we do it regardless of the options # for building with no libs, so we do it regardless of the options
echo nwjs-sdk-v0.16.0-`uname | tr '[:upper:]' '[:lower:]'` #echo nwjs-sdk-v0.16.0-`uname | tr '[:upper:]' '[:lower:]'`
if [ ! -d "../pd/nw/nw" ]; then if [ ! -d "../pd/nw/nw" ]; then
if [ `getconf LONG_BIT` -eq 32 ]; then if [ `getconf LONG_BIT` -eq 32 ]; then
arch="ia32" arch="ia32"
...@@ -245,17 +245,20 @@ then ...@@ -245,17 +245,20 @@ then
fi fi
if [ $full -gt 1 -o $deb -eq 2 -o $inno -eq 2 -o $dmg -eq 2 ] if [ $full -gt 1 -o $deb -eq 2 -o $inno -eq 2 -o $dmg -eq 2 ]
then then
test $clean -ne 0 && make distclean || true # this may fail on 1st attempt test $clean -ne 0 && make distclean || true
# Run `make git_version` *now* so that we already have
# s_stuff.h when we copy it below. XXXNOTE AG: The build seems
# to work just fine even when skipping all this, so why again
# is this needed?
make -C .. git_version
cp ../../pd/src/g_all_guis.h ../../externals/build/include cp ../../pd/src/g_all_guis.h ../../externals/build/include
cp ../../pd/src/g_canvas.h ../../externals/build/include cp ../../pd/src/g_canvas.h ../../externals/build/include
cp ../../pd/src/m_imp.h ../../externals/build/include cp ../../pd/src/m_imp.h ../../externals/build/include
cp ../../pd/src/m_pd.h ../../externals/build/include cp ../../pd/src/m_pd.h ../../externals/build/include
# ag: s_stuff.h may not exist at this point yet (will be cp ../../pd/src/s_stuff.h ../../externals/build/include
# generated later), is this really needed here? cp ../../pd/src/g_all_guis.h ../../externals/build/include
test -f ../../pd/src/s_stuff.h && cp ../../pd/src/s_stuff.h ../../externals/build/include
cp ../../pd/src/g_all_guis.h ../../externals/build/include
rm -rf build/
fi fi
rm -rf build/
if [ $rpi -eq 0 ] if [ $rpi -eq 0 ]
then then
echo "installing desktop version..." echo "installing desktop version..."
...@@ -276,11 +279,11 @@ then ...@@ -276,11 +279,11 @@ then
echo `pwd` echo `pwd`
make install && make package make install && make package
else else
# create images folder
mkdir -p ../../packages/linux_make/build$inst_dir/lib/pd-l2ork/extra/images
make install prefix=$inst_dir make install prefix=$inst_dir
fi fi
echo "copying pd-l2ork-specific externals..." echo "copying pd-l2ork-specific externals..."
# create images folder
mkdir -p ../../packages/linux_make/build$inst_dir/lib/pd-l2ork/extra/images
# patch_name # patch_name
# spectdelay # spectdelay
if [[ $os == "win" ]]; then if [[ $os == "win" ]]; then
......
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