[SCM] supercollider/master: Revert mistaken commits in 0284afad

[danstowell-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit cca6d55b17dbaaf87f5e7de66221d250745ef3ce
Author: Dan Stowell <danstowell at users.sourceforge.net>
Date:   Fri Jul 22 22:20:55 2011 +0100

    Revert mistaken commits in 0284afad

diff --git a/common/SConstruct b/common/SConstruct
index af08a0d..76908d0 100644
--- a/common/SConstruct
+++ b/common/SConstruct
@@ -788,7 +788,7 @@ if PLATFORM == 'darwin':
 elif PLATFORM == 'linux':
     serverEnv.Append(
                 CPPDEFINES = [('SC_PLUGIN_LOAD_SYM', '\\"load\\"')],
-                LINKFLAGS = ['-Wl,-rpath-link,' + FINAL_PREFIX + '/lib'])
+                LINKFLAGS = ['-Wl,-rpath,' + FINAL_PREFIX + '/lib'])
 
 elif PLATFORM == 'freebsd':
     serverEnv.Append(CPPDEFINES = [('SC_PLUGIN_LOAD_SYM', '\\"load\\"')])
@@ -1041,12 +1041,12 @@ if PLATFORM == 'darwin':
                 CPPPATH = ['#include/icu/unicode'])
 elif PLATFORM == 'linux':
     langEnv.Append(
-        LINKFLAGS = ['-Wl,-rpath-link,build', '-Wl,-rpath-link,' + FINAL_PREFIX + '/lib'])
+        LINKFLAGS = ['-Wl,-rpath,build', '-Wl,-rpath,' + FINAL_PREFIX + '/lib'])
 
 
 elif PLATFORM == 'freebsd':
     langEnv.Append(
-    LINKFLAGS = '-Wl,-rpath-link,build -Wl,-rpath-link,' + FINAL_PREFIX + '/lib')
+    LINKFLAGS = '-Wl,-rpath,build -Wl,-rpath,' + FINAL_PREFIX + '/lib')
 
 if env['CURL']:
     langEnv.Append(CPPDEFINES = ['HAVE_LIBCURL'])
@@ -1272,10 +1272,10 @@ if env['SCEL']:
                 'sed \'s, at PKG_DATA_DIR@,%s,g\' < $SOURCE > $TARGET' %
                 pkg_data_dir(FINAL_PREFIX))
     el_files = glob.glob('../editors/scel/el/*.el') + ['../editors/scel/el/sclang-vars.el']
-    elc_files = [] #map(lambda f: os.path.splitext(f)[0] + '.elc', el_files)
-    elisp_dir = os.path.join(INSTALL_PREFIX, 'share', 'emacs', 'site-lisp', 'supercollider')
-    #env.Command(elc_files, el_files,
-    #            'emacs -batch --eval "(add-to-list \'load-path (expand-file-name \\"../editors/scel/el/\\"))" -f batch-byte-compile $SOURCES')
+    elc_files = map(lambda f: os.path.splitext(f)[0] + '.elc', el_files)
+    elisp_dir = os.path.join(INSTALL_PREFIX, 'share', 'emacs', 'site-lisp')
+    env.Command(elc_files, el_files,
+                'emacs -batch --eval "(add-to-list \'load-path (expand-file-name \\"../editors/scel/el/\\"))" -f batch-byte-compile $SOURCES')
     env.Alias('install-elisp', env.Install(elisp_dir, el_files + elc_files))
     installEnv.Append(DATA = 'install-elisp')
 
diff --git a/editors/sced/SConstruct b/editors/sced/SConstruct
index 472d34a..94d9957 100644
--- a/editors/sced/SConstruct
+++ b/editors/sced/SConstruct
@@ -123,7 +123,7 @@ install_scedfiles = env.Alias('install-scedfiles', [
 update_mime = Builder(action =
 		'update-mime-database ' + os.path.join( share_dir(PREFIX), 'mime/packages' ) )
 
-#env.BUILDERS = update_mime
+env.BUILDERS = update_mime
 
 #install_doc = env.Alias('install-doc', env.Install(DOC_DIR, ['SCVim.scd']))
 #build_help = env.Alias('build-help', env.BuildHelp(target = Dir(DOC_DIR),
diff --git a/editors/scvim/SConstruct b/editors/scvim/SConstruct
index 888809c..dbecdbc 100644
--- a/editors/scvim/SConstruct
+++ b/editors/scvim/SConstruct
@@ -91,18 +91,18 @@ opts.Add(PathOption('SUPERCOLLIDER_HELP_DIR',
 	DEFAULT_SC_HELP, PathOption.PathIsDir))
 
 #create our enviroment, with our options and custom builders
-env = Environment(options = opts)
+env = Environment(options = opts, BUILDERS = {'BuildHelp' : build_help})
 
 
 #generate the help options
 Help(opts.GenerateHelpText(env))
 
 #XXX how do we test for vim?
-#if not env.GetOption('clean'):
-#	#test for the ruby
-#	if os.system("ruby -e exit") != 0:
-#		print "error: scvim depends on ruby and the ruby executable is not in your path"
-#		Exit(1)
+if not env.GetOption('clean'):
+	#test for the ruby
+	if os.system("ruby -e exit") != 0:
+		print "error: scvim depends on ruby and the ruby executable is not in your path"
+		Exit(1)
 
 #get our variables from the options
 PREFIX = env.get('PREFIX')
@@ -124,10 +124,10 @@ install_vimfiles = env.Alias('install-vimfiles', [
 	)
 
 install_doc = env.Alias('install-doc', env.Install(DOC_DIR, ['SCVim.scd']))
-#build_help = env.Alias('build-help', env.BuildHelp(target = Dir(DOC_DIR),
-#	source = Dir(SUPERCOLLIDER_HELP_DIR)))
+build_help = env.Alias('build-help', env.BuildHelp(target = Dir(DOC_DIR),
+	source = Dir(SUPERCOLLIDER_HELP_DIR)))
 AlwaysBuild(Dir(DOC_DIR))
-#Depends(build_help, install_doc)
+Depends(build_help, install_doc)
 
 install_bin = env.Alias('install-bin',
 		install_dir(env, 'bin', bin_dir(PREFIX), ANY_FILE_RE, 1))
@@ -142,7 +142,7 @@ install_classes = env.Alias('install-classes', install_dir(
 env.Alias('install-all', [
 	install_bin,
 	install_vimfiles,
-#	install_doc,
+	install_doc,
 	install_rc,
 	install_classes])
 

-- 
supercollider packaging