--- a/driver.py	Tue Dec 27 19:18:09 2005 +0100
+++ b/driver.py	Tue Dec 27 22:04:42 2005 +0100
@@ -161,18 +161,32 @@
 	install_manager = xpm.Package_manager (settings.installer_root,
 					       settings.os_interface)
 
+	settings.framework_root = ('%(installer_root)s/usr/lib/lilypond/%(bundle_version)s/lib'
+				   % settings.__dict__)
+	framework_manager = xpm.Package_manager (settings.framework_root,
+						 settings.os_interface)
+
+	# why p instead of i?
 	for p in target_manager._packages.values ():
-		if not isinstance (p, gub.Sdk_package):
+		if isinstance (p, gub.Sdk_package):
+			continue
+		if (p.name () != 'lilypond'
+		    # Fixme, use settings.framework_packages or so?
+		    and settings.platform.startswith ('linux')):
+			framework_manager.register_package (p)
+		else:
 			install_manager.register_package (p)
 
 	for p in install_manager._packages.values ():
 		install_manager.install_package  (p)
+	for p in framework_manager._packages.values ():
+		framework_manager.install_package  (p)
 
 	import installer
 	for p in installer.get_installers (settings):
 		settings.os_interface.log_command (' *** Stage: %s (%s)\n'
-						   % ('create', p.name ()))
-		p.create ()
+						   % ('create', i.name ()))
+		i.create ()
 		
 def run_builder (settings, pkg_manager, args):
 	os.environ["PATH"] = '%s/%s:%s' % (settings.tooldir, 'bin',

--- a/specs/installer.py	Tue Dec 27 19:18:09 2005 +0100
+++ b/specs/installer.py	Tue Dec 27 22:04:42 2005 +0100
@@ -25,6 +25,7 @@
 	def strip_unnecessary_files (self):
 		"Remove unnecessary cruft."
 	
+		framework_root = 'usr/lib/lilypond/%(bundle_version)s/lib'
 		for i in (
 			'bin/autopoint',
 			'bin/glib-mkenums',
@@ -69,7 +70,7 @@
 			'share/man',
 			'share/omf',
 		):
-			self.system ('cd %(installer_root)s && rm -rf %(i)s usr/%(i)s', locals ())
+			self.system ('cd %(installer_root)s && rm -rf %(i)s usr/%(i)s %(framework_root)s/usr/%(i)s', locals ())
 
 		# prune harder
 		for i in (
@@ -101,22 +102,21 @@
 			 'share/gs/fonts/c[^0][^9][^5]*',
 			 'share/gs/Resource',
 			 ):
-			self.system ('cd %(installer_root)s && rm -rf %(i)s usr/%(i)s' , locals ())
+			self.system ('cd %(installer_root)s && rm -rf %(i)s usr/%(i)s %(framework_root)s/usr/%(i)s' , locals ())
 
 	def strip_binary_file (self, file):
 		self.system ('%(strip_command)s %(file)s', locals (), ignore_error = True)
 
 	def strip_binary_dir (self, dir):
-		(root, dirs, files) = os.walk(dir).next ()
+		(root, dirs, files) = os.walk (dir % self.get_substitution_dict ()).next ()
 		for f in files:
 			if os.path.basename (f) not in self.no_binary_strip:
 				self.strip_binary_file (root + '/' + f)
 			
 	def strip (self):
 		self.strip_unnecessary_files ()
-		self.strip_binary_dir (self.settings.installer_root + '/usr/lib')
-		self.strip_binary_dir (self.settings.installer_root + '/usr/bin')
-
+		self.strip_binary_dir ('%(installer_root)s/usr/lib')
+		self.strip_binary_dir ('%(installer_root)s/usr/bin')
 		
 	def create (self):
 		self.strip ()
@@ -168,10 +168,17 @@
 class Linux_installer (Installer):
 	def __init__ (self, settings):
 		Installer.__init__ (self, settings)
-		self.strip_command += ' -g '
+		# lose the i486-foo-bar-baz-
+		self.strip_command = 'strip -g'
+
+	def strip (self):
+		Installer.strip (self)
+		self.strip_binary_dir ('%(installer_root)s/usr/lib/lilypond/%(bundle_version)s/lib/usr/bin')
+		self.strip_binary_dir ('%(installer_root)s/usr/lib/lilypond/%(bundle_version)s/lib/usr/lib')
 
 class Tgz (Linux_installer):
 	def create (self):
+		Linux_installer.create (self)
 		build = self.settings.bundle_build
 		self.system ('tar -C %(installer_root)s -zcf %(installer_uploads)s/%(name)s-%(bundle_version)s-%(package_arch)s-%(build)s.tgz .', locals ())
 
@@ -198,8 +205,6 @@
 		self.system ('mv %(build_autopackage)s/*.package %(installer_uploads)s')
 
 
-
-
 def get_installers (settings):
 	installers = {
 		'darwin' : [Darwin_bundle (settings)],