[SCM] supercollider/scons_soversion: Use DESTDIR instead of --install-sandbox in main scons installation

fsateler at users.alioth.debian.org fsateler at users.alioth.debian.org
Tue Mar 8 02:42:20 UTC 2011


The following commit has been merged in the scons_soversion branch:
commit ab4f155ddd5c5e3d3912fe4e03f22ccef99a287a
Author: Felipe Sateler <fsateler at debian.org>
Date:   Mon Mar 7 23:40:25 2011 -0300

    Use DESTDIR instead of --install-sandbox in main scons installation
    
    But first we need to patch SConstruct to accept nonexisting DESTDIR
    paths.

diff --git a/common/SConstruct b/common/SConstruct
index 3ee19a2..bee34da 100644
--- a/common/SConstruct
+++ b/common/SConstruct
@@ -298,7 +298,8 @@ opts.AddOptions(
     BoolOption('DEBUG',
                'Build with debugging information', 0),
     PathOption('DESTDIR',
-               'Intermediate installation prefix for packaging', '/'),
+               'Intermediate installation prefix for packaging', '/',
+               PathOption.PathAccept),
     BoolOption('DEVELOPMENT',
                'Build and install the development files', 0),
     BoolOption('FFTW',
diff --git a/debian/rules b/debian/rules
index 0e21992..10f0af3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,7 +28,7 @@ DEB_BUILDDIR=common
 # SCVIM/SCED=0 here, because we install them by hand below
 # (so that the build won't break)
 DEB_SCONS_OPTIONS = DEVELOPMENT=yes PREFIX=/usr CROSSCOMPILE=1 STRIP=1 CURL=0 SCVIM=0 SCED=0
-DEB_SCONS_INSTALL_TARGET = --install-sandbox=$(DEB_DESTDIR) install
+DEB_SCONS_INSTALL_TARGET = DESTDIR=$(DEB_DESTDIR) install
 
 # The build system apparently can't handle this
 CXXFLAGS =

-- 
supercollider packaging



More information about the pkg-multimedia-commits mailing list