Package: olsrd
Version: 0.6.2-1
Severity: minor
Tags: patch

The upstream 'make uberclean' includes a "find . -name *.d" to delete
the *.d dependency files from the build.  The problem is that it also
finds debian/olsrd/etc/init.d, which is a directly, and then fails,
therefore stopping the whole clean process.  This patch works around
that problem, making building the package itself easier.

This patch assumes the patches in bug #658329 are already applied:
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=658329
From 459fd01a5d538bdf331497fa44f2721618f290b0 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <h...@eds.org>
Date: Thu, 2 Feb 2012 13:56:20 -0500
Subject: [PATCH 08/11] work around upstream problem in 'make uberclean'

---
 debian/rules |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index f04824c..7cfd4ee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,10 +12,14 @@ override_dh_auto_build:
 	$(MAKE) -C gui/linux-gtk
 
 override_dh_auto_clean:
-	[ ! -f Makefile ] || $(MAKE) uberclean
+	dh_auto_clean
 	$(MAKE) -C $(CURDIR)/gui/linux-gtk clean
 	rm -f $(CURDIR)/gui/linux-gtk/olsrd-gui
-	rm -f $(CURDIR)/lib/*/src/*.o $(CURDIR)/lib/*/*.so.?.?
+	$(MAKE) clean
+	$(MAKE) clean_libs
+	# uberclean fails sometimes because it does "find -name '*.[od]'", which
+	# also finds the debian/etc/init.d directory, which "rm -f" cannot remove
+	#$(MAKE) uberclean
 
 override_dh_auto_install:
 	$(MAKE) DESTDIR=$(CURDIR)/debian/olsrd install STRIP=: 
-- 
1.7.5.4

Reply via email to