Actually fix Unix scripts this time. :)

libsdl-org · Dec 24, 2014 · 629c13f · 629c13f
1 parent 9c38244
commit 629c13f
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/build-scripts/emscripten-buildbot.sh b/build-scripts/emscripten-buildbot.sh
@@ -47,22 +47,21 @@ echo "Setting up..."
 set -x
 cd "$SDLBASE"
 rm -rf buildbot
-rm -rf emscripten-sdl2-installed
 mkdir buildbot
 pushd buildbot
 
 echo "Configuring..."
-emconfigure ../configure --host=asmjs-unknown-emscripten --disable-assembly --disable-threads --enable-cpuinfo=false CFLAGS="-O2 -Wno-warn-absolute-paths -Wdeclaration-after-statement -Werror=declaration-after-statement" --prefix="$SDLBASE/emscripten-sdl2-installed"
+emconfigure ../configure --host=asmjs-unknown-emscripten --disable-assembly --disable-threads --enable-cpuinfo=false CFLAGS="-O2 -Wno-warn-absolute-paths -Wdeclaration-after-statement -Werror=declaration-after-statement" --prefix="$PWD/emscripten-sdl2-installed"
 
 echo "Building..."
 emmake $MAKE
 
 echo "Moving things around..."
 emmake $MAKE install
 # Fix up a few things to a real install path
-perl -w -pi -e "s#$SDLBASE/emscripten-sdl2-installed#/usr/local#g;" ./emscripten-sdl2-installed/lib/libSDL2.la ./emscripten-sdl2-installed/lib/pkgconfig/sdl2.pc ./emscripten-sdl2-installed/bin/sdl2-config
+perl -w -pi -e "s#$PWD/emscripten-sdl2-installed#/usr/local#g;" ./emscripten-sdl2-installed/lib/libSDL2.la ./emscripten-sdl2-installed/lib/pkgconfig/sdl2.pc ./emscripten-sdl2-installed/bin/sdl2-config
 mkdir -p ./usr
-mv "$SDLBASE/emscripten-sdl2-installed" ./usr/local
+mv ./emscripten-sdl2-installed ./usr/local
 popd
 tar -cJvvf $TARBALL -C buildbot usr
 rm -rf buildbot