From dc37744224884af58fd7741081db378d3b2b1e83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Fri, 10 Jun 2005 13:35:06 +0000 Subject: [PATCH] =?UTF-8?q?Slash=20gereklili=C4=9Fi...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/libbuild/autotools.py | 2 +- src/libbuild/gnuconfig.py | 9 ++++++--- src/libbuild/libbuild.py | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/libbuild/autotools.py b/src/libbuild/autotools.py index 150d40db..488d99fc 100644 --- a/src/libbuild/autotools.py +++ b/src/libbuild/autotools.py @@ -26,4 +26,4 @@ def install(): sysconfdir={D}/etc \ install' - os.system( install_string.replace( '{D}', os.path.dirname( os.getcwd() + '/image' )) + os.system( install_string.replace( '{D}', os.path.dirname( os.getcwd() + '/image' ))) diff --git a/src/libbuild/gnuconfig.py b/src/libbuild/gnuconfig.py index 32a61b3a..4b4db772 100644 --- a/src/libbuild/gnuconfig.py +++ b/src/libbuild/gnuconfig.py @@ -1,9 +1,12 @@ #!/usr/bin/python # -*- coding: utf-8 -*- -import os, string, re, shutil, pisiconfig +import os, string, re, shutil from shell import * +sys.path.append('..') +import pisiconfig + def gnuconfig_findnewest(): locations = [ '/usr/share/gnuconfig/config.sub', '/usr/share/automake-1.8/config.sub', '/usr/share/automake-1.7/config.sub', '/usr/share/automake-1.6/config.sub', '/usr/share/automake-1.5/config.sub', '/usr/share/automake-1.4/config.sub' ] @@ -24,8 +27,8 @@ def gnuconfig_update( package_name ): newer_location = gnuconfig_findnewest() try: - shutil.copyfile( newer_location + '/config.sub', pisiconfig.tmp_dir + package_name + '/build/config.sub' ) - shutil.copyfile( newer_location + '/config.guess', pisiconfig.tmp_dir + package_name + '/build/config.guess' ) + shutil.copyfile( newer_location + '/config.sub', pisiconfig.tmp_dir + '/' + package_name + '/build/config.sub' ) + shutil.copyfile( newer_location + '/config.guess', pisiconfig.tmp_dir + '/' + package_name + '/build/config.guess' ) except IOError: print 'Hata mata...' sys.exit() diff --git a/src/libbuild/libbuild.py b/src/libbuild/libbuild.py index 0a2de900..d8a5ee28 100644 --- a/src/libbuild/libbuild.py +++ b/src/libbuild/libbuild.py @@ -11,7 +11,7 @@ import pisiconfig if __name__ == "__main__": package_name = 'popt-1.7' - os.chdir( pisiconfig.tmp_dir + package_name + '/build' ) + os.chdir( pisiconfig.tmp_dir + '/' + package_name + '/build' ) gnuconfig_update( package_name ) libtoolize()