Mercurial > gub

changeset 83:9ab077701e4b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bugfix: remove expat install prefix overrides
author janneke <janneke@gnu.org>
date Thu, 01 Dec 2005 08:57:00 +0100
parents 85bcf949d16a
children c7d179ebf63a
files specs/framework.py
diffstat 1 files changed, 6 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/specs/framework.py	Thu Dec 01 08:36:37 2005 +0100
+++ b/specs/framework.py	Thu Dec 01 08:57:00 2005 +0100
@@ -370,27 +370,18 @@
 ''', locals ())
 
 class Expat (gub.Target_package):
-#	def configure (self):
-#		self.autoupdate ()
-#		gub.Target_package.configure (self)
-
-	def compile_command (self):
-		return gub.Target_package.compile_command (self) \
-		       + gub.join_lines ('''
+	def makeflags (self):
+		return gub.join_lines ('''
 CFLAGS="-O2 -DHAVE_EXPAT_CONFIG_H"
 EXEEXT=
 RUN_FC_CACHE_TEST=false
 ''')
+	def compile_command (self):
+		return gub.Target_package.compile_command (self) \
+		       + self.makeflags ()
 	def install_command (self):
 		return gub.Target_package.install_command (self) \
-		       + gub.join_lines ('''
-EXEEXT=
-RUN_FC_CACHE_TEST=false
-exec_prefix=%(install_prefix)s
-libdir=%(install_prefix)s/lib
-includedir=%(install_prefix)s/include
-man1dir=%(install_prefix)s/share/man/man1
-''')
+		       + self.makeflags ()
 
 class Zlib (gub.Target_package):
 	def configure (self):