r2506 - trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian

[Joshua Kwan]

Author: joshk
Date: 2005-02-17 10:57:31 +0100 (Thu, 17 Feb 2005)
New Revision: 2506

Modified:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/rules
Log:
i lied

Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2005-02-17 09:54:59 UTC (rev 2505)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2005-02-17 09:57:31 UTC (rev 2506)
@@ -27,8 +27,11 @@
   * sparc64-nis-killer.dpatch: patch that fixes some compatibility functions
     that (as a side effect) caused NIS to flatten a sparc64 machine.
     closes: #295626 (Joshua Kwan)
+  
+  * Turn ifeq into a shell construct to allow things to still work if the orig
+    tarball is unavailable. (Joshua Kwan)
 
- -- Joshua Kwan <joshk@triplehelix.org>  Thu, 17 Feb 2005 01:54:44 -0800
+ -- Joshua Kwan <joshk@triplehelix.org>  Thu, 17 Feb 2005 01:56:59 -0800
 
 kernel-source-2.6.8 (2.6.8-13) unstable; urgency=high
 

Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/rules
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/rules	2005-02-17 09:54:59 UTC (rev 2505)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/rules	2005-02-17 09:57:31 UTC (rev 2506)
@@ -19,12 +19,13 @@
 	override_version=$(release) home=debian/patches sh debian/apply $(upstream)
 
 ../orig/kernel-source-$(upstream)-$(upstream):
-ifneq (,$(wildcard ../kernel-source-$(upstream)_$(upstream).orig.tar.gz))
-	mkdir -p ../orig
-	tar -C ../orig -xzf ../kernel-source-$(upstream)_$(upstream).orig.tar.gz
-else
-$(error "Can't find orig tarball.")
-endif
+	if [ -f "../kernel-source-$(upstream)_$(upstream).orig.tar.gz" ]; then \
+		mkdir -p ../orig;
+		tar -C ../orig -xzf ../kernel-source-$(upstream)_$(upstream).orig.tar.gz; \
+	else \
+		echo "Can't find orig tarball." >&2; \
+		exit 1; \
+	fi
 
 orig: ../orig/kernel-source-$(upstream)-$(upstream)
 	rsync -av --delete --exclude .svn --exclude debian ../orig/kernel-source-$(upstream)-$(upstream)/ .