Don't assume i686 platform in cvs compile script

git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@248 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109

1 files changed, 18 insertions, 2 deletions

diff --git a/rdiff-backup/rdiff_backup/compilec.py b/rdiff-backup/rdiff_backup/compilec.py
index 17f6ea0..f5a8365 100755
--- a/rdiff-backup/rdiff_backup/compilec.py
+++ b/rdiff-backup/rdiff_backup/compilec.py
@@ -13,6 +13,22 @@ setup(name="CModule",
 				   Extension("_librsync", ["_librsyncmodule.c"],
 							 libraries=["rsync"])])
 
-assert not os.system("mv build/lib.linux-i686-2.2/C.so .")
-assert not os.system("mv build/lib.linux-i686-2.2/_librsync.so .")
+def get_libraries():
+	"""Return filename of C.so and _librsync.so files"""
+	build_files = os.listdir("build")
+	lib_dirs = filter(lambda x: x.startswith("lib"), build_files)
+	assert len(lib_dirs) == 1, "No library directory or too many"
+	libdir = lib_dirs[0]
+	clib = os.path.join("build", libdir, "C.so")
+	rsynclib = os.path.join("build", libdir, "_librsync.so")
+	try:
+		os.lstat(clib)
+		os.lstat(rsynclib)
+	except os.error:
+		print "Library file missing"
+		sys.exit(1)
+	return clib, rsynclib
+	
+for filename in get_libraries():
+	assert not os.system("mv %s ." % (filename,))
 assert not os.system("rm -rf build")