From: Ian Beckwith <ianb@erislabs.net>
Date: Mon, 30 Aug 2010 19:12:19 +0000 (+0100)
Subject: push quilt patches after merge
X-Git-Tag: debian/20100829+stable-1~6
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=6df71e0db891a16ea1215a2b04b4ea8d9aab2c21;p=gnulib.git

push quilt patches after merge
---

diff --git a/gnulib-tool b/gnulib-tool
index 605687f66..b8ef8924a 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -410,7 +410,7 @@ func_gnulib_dir ()
       * ) self_abspathname=`echo "$self_abspathname" | sed -e 's,/[^/]*$,,'`/"$linkval" ;;
     esac
   done
-  gnulib_dir=`echo "$self_abspathname" | sed -e 's,/[^/]*$,,'`
+  gnulib_dir=/usr/share/gnulib
 }
 
 # func_tmpdir
diff --git a/lib/uniname/gen-uninames.lisp b/lib/uniname/gen-uninames.lisp
index d08e93f06..ec24d9776 100755
--- a/lib/uniname/gen-uninames.lisp
+++ b/lib/uniname/gen-uninames.lisp
@@ -1,4 +1,4 @@
-#!/usr/local/bin/clisp -C
+#!/usr/bin/clisp -C
 
 ;;; Creation of gnulib's uninames.h from the UnicodeData.txt table.
 ;;; Bruno Haible 2000-12-28