[Python-modules-commits] r3330 - /packages/pynxt/trunk/debian/rules

[bzed-guest at users.alioth.debian.org]

Author: bzed-guest
Date: Sun Sep 30 01:06:13 2007
New Revision: 3330

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=3330
Log:
more fixes in the rules file, hopefully all for now

Modified:
    packages/pynxt/trunk/debian/rules

Modified: packages/pynxt/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/pynxt/trunk/debian/rules?rev=3330&op=diff
==============================================================================
--- packages/pynxt/trunk/debian/rules (original)
+++ packages/pynxt/trunk/debian/rules Sun Sep 30 01:06:13 2007
@@ -15,10 +15,10 @@
 
 #first find our build dependencies:
 GCC_SOURCE = $(shell dpkg -L gcc-4.2-source | grep "gcc-[0-9.]*-dfsg.tar.bz2")
-GCC_DIR = $(shell tar tfj $(GCC_SOURCE) | head -1)
+GCC_DIR = $(shell tar tfj $(GCC_SOURCE) | head -1 | sed 's,/.*,,')
 
 BINUTILS_SOURCE = $(shell dpkg -L binutils-source | grep "/usr/src/binutils/binutils-.*.tar.bz2")
-BINUTILS_DIR = $(shell tar tfj $(BINUTILS_SOURCE) | head -1)
+BINUTILS_DIR = $(shell tar tfj $(BINUTILS_SOURCE) | head -1 | sed 's,/.*,,')
 
 TOOLCHAIN_DIR=$(CURDIR)/toolchain
 
@@ -72,7 +72,9 @@
 	rm -f flash_driver.bin
 
 clean_toolchain:
-        rm -rf $(TOOLCHAIN_DIR) $(GCC_DIR) $(BINUTILS_DIR)
+	for dir in $(TOOLCHAIN_DIR) $(GCC_DIR) $(BINUTILS_DIR); do \
+	    [ ! -d "$$dir" ] || rm -rf $$dir ;\
+	done
 
 clean: clean_flash_driver.bin clean_toolchain
 	dh_testdir