From 66b188de90d3ec8d073a62c538e9cd9771609267 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= <caglar@pardus.org.tr>
Date: Sat, 11 Jun 2005 17:38:30 +0000
Subject: [PATCH] =?UTF-8?q?Biraz=20temizlik=20o=20kadar,=20ciddi=20bir?=
 =?UTF-8?q?=C5=9Fey=20yok...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/libbuild/autotools.py  |  6 +++---
 src/libbuild/gnuconfig.py  | 13 +++++--------
 src/libbuild/libbuild.py   |  8 +++++---
 src/libbuild/libtoolize.py |  5 +----
 4 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/libbuild/autotools.py b/src/libbuild/autotools.py
index 43c0f520..ca087130 100644
--- a/src/libbuild/autotools.py
+++ b/src/libbuild/autotools.py
@@ -24,7 +24,7 @@ def make():
 def install():
 	''' FIXME: Düzgün hale getirilecek '''
 	''' {D} = /var/tmp/pisi/ _paket_adı_ /image/ '''
-
+	
 	install_string = 'make prefix={D}/usr \
 				datadir={D}/usr/share \
 				infodir={D}/usr/share/info \
@@ -32,5 +32,5 @@ def install():
 				mandir={D}/usr/share/man \
 				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 3c19845a..bb4ef702 100644
--- a/src/libbuild/gnuconfig.py
+++ b/src/libbuild/gnuconfig.py
@@ -1,12 +1,9 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 
-import os, string, re, shutil
+import os, string, re, shutil, pisiconfig
 from shell import *
 
-sys.path.append('..')
-import pisiconfig
-
 def gnuconfig_findnewest():
 	''' find the newest config.* file according to timestamp and return it '''
 
@@ -23,14 +20,14 @@ def gnuconfig_findnewest():
 
 	return os.path.dirname( newer_location.popitem()[0] )
 
-def gnuconfig_update( package_name ):
+def gnuconfig_update():
 	''' copy newest config.* onto source's '''
 
 	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', os.getcwd() + '/config.sub' )
+		shutil.copyfile( newer_location + '/config.guess', os.getcwd() + '/config.guess' )
 	except IOError:
 		print 'Hata mata...'
 		sys.exit()
diff --git a/src/libbuild/libbuild.py b/src/libbuild/libbuild.py
index d8a5ee28..ca2c4b18 100644
--- a/src/libbuild/libbuild.py
+++ b/src/libbuild/libbuild.py
@@ -8,12 +8,14 @@ from autotools import *
 sys.path.append('..')
 import pisiconfig
 
-if __name__ == "__main__":
-	package_name = 'popt-1.7'
 
+if __name__ == "__main__":
+	''' WILLBE: Unpack module will pass the package name to action script '''
+	package_name = 'popt-1.7'
+	''' WILLBE: pisi-build call action script after entered the build directory '''
 	os.chdir( pisiconfig.tmp_dir + '/' + package_name + '/build' )
 
-	gnuconfig_update( package_name )
+	gnuconfig_update()
 	libtoolize()
 	configure( '--with-nls' )
 	make()
diff --git a/src/libbuild/libtoolize.py b/src/libbuild/libtoolize.py
index b470117c..15e47c55 100644
--- a/src/libbuild/libtoolize.py
+++ b/src/libbuild/libtoolize.py
@@ -1,10 +1,7 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 
-import os,sys
-
-sys.path.append('..')
-import pisiconfig
+import os,sys, pisiconfig
 
 def libtoolize():
         ''' FIXME: Düzgün hale getirilecek '''