# HG changeset patch
# User Han-Wen Nienhuys <hanwen@lilypond.org>
# Date 1180059245 10800
# Node ID aeacf06a99b5c133709486f56593bfdbf2472de6
# Parent  d3db27369b220b6f97f1aaa0933e166f6ba51d94
git-reset before patching

diff -r d3db27369b22 -r aeacf06a99b5 gub/specs/guile.py
--- a/gub/specs/guile.py	Thu May 24 23:13:55 2007 -0300
+++ b/gub/specs/guile.py	Thu May 24 23:14:05 2007 -0300
@@ -53,13 +53,13 @@
         return '.'.join (self.ball_version.split ('.')[0:2])
 
     def patch (self):
+        self.system ('cd %(srcdir)s && git reset --hard HEAD')
         self.autogen_sh()
 
         ## Don't apply patch twice.
-        if None == re.search ('reloc_p=', open (self.expand ('%(srcdir)s/configure.in')).read()):
-            self.system ('cd %(srcdir)s && patch -p0 < %(patchdir)s/guile-reloc.patch')
-            self.system ('cd %(srcdir)s && patch -p1 < %(patchdir)s/guile-cexp.patch')
-            self.dump ('''#!/bin/sh
+        self.system ('cd %(srcdir)s && patch -p0 < %(patchdir)s/guile-reloc.patch')
+        self.system ('cd %(srcdir)s && patch -p1 < %(patchdir)s/guile-cexp.patch')
+        self.dump ('''#!/bin/sh
 exec %(local_prefix)s/bin/guile "$@"
 ''', "%(srcdir)s/pre-inst-guile.in")