changeset 12:30aa2d214b5c

bugfixses: install, freetype init
author janneke <janneke@gnu.org>
date Fri, 25 Nov 2005 10:10:04 +0100
parents f87f9d511a99
children 3f5c14f974bc
files specs/framework.py specs/gub.py
diffstat 2 files changed, 3 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/specs/framework.py	Fri Nov 25 09:29:55 2005 +0100
+++ b/specs/framework.py	Fri Nov 25 10:10:04 2005 +0100
@@ -28,10 +28,6 @@
 '''
 
 class Freetype (gub.Target_package):
-	def __init__ (self, settings):
-		gub.Package.__init__ (self, settings)
-		self.with (mirror=download.freetype)
-
 	def configure (self):
 		self.system ('''
 		rm -f %(srcdir)s/builds/unix/{unix-def.mk,unix-cc.mk,ftconfig.h,freetype-config,freetype2.pc,config.status,config.log}
@@ -76,7 +72,7 @@
 		Gettext (settings).with (version='0.14.5'),
 		Libiconv (settings).with (version='1.9.2'),
 		Glib (settings).with (version='2.8.4', mirror=download.gtk),
-		Freetype (settings).with (version='2.1.9'),
+		Freetype (settings).with (version='2.1.9', mirror=download.freetype),
 		LilyPond (settings).with (mirror=cvs.gnu, download=gub.Package.cvs),
 	),
 	}
--- a/specs/gub.py	Fri Nov 25 09:29:55 2005 +0100
+++ b/specs/gub.py	Fri Nov 25 10:10:04 2005 +0100
@@ -225,8 +225,8 @@
 --target=%(target_architecture)s \
 --prefix=/usr \
 --sysconfdir=/etc \
---includedir=%(systemdir)s/include \
---libdir=%(systemdir)s/lib \
+--includedir=%(systemdir)s/usr/include \
+--libdir=%(systemdir)s/usr/lib \
 '''
 
 ## wtf?