From: Ian Beckwith <ianb@erislabs.net>
Date: Mon, 30 Aug 2010 20:55:00 +0000 (+0100)
Subject: refresh patch 01-gnulib-directory;push patches
X-Git-Tag: debian/20100829+stable-1~2
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=2a9e3fdf704cc01707c4cb67999f2cd79b25a439;p=gnulib.git

refresh patch 01-gnulib-directory;push patches
---

diff --git a/debian/patches/01-gnulib-directory.patch b/debian/patches/01-gnulib-directory.patch
index 4370c54b7..4e3928614 100644
--- a/debian/patches/01-gnulib-directory.patch
+++ b/debian/patches/01-gnulib-directory.patch
@@ -3,9 +3,9 @@ Description: Sets the gnulib directory.
 
 Index: gnulib/gnulib-tool
 ===================================================================
---- gnulib.orig/gnulib-tool	2010-04-19 18:32:48.000000000 +0100
-+++ gnulib/gnulib-tool	2010-04-19 18:32:57.000000000 +0100
-@@ -410,7 +410,7 @@
+--- gnulib.orig/gnulib-tool	2010-08-30 21:52:12.000000000 +0100
++++ gnulib/gnulib-tool	2010-08-30 21:53:59.000000000 +0100
+@@ -419,7 +419,7 @@
        * ) self_abspathname=`echo "$self_abspathname" | sed -e 's,/[^/]*$,,'`/"$linkval" ;;
      esac
    done
diff --git a/gnulib-tool b/gnulib-tool
index b606ad6a6..b79e11cea 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -419,7 +419,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