make makeconf.sh work under FreeBSD

diff --git a/ChangeLog b/ChangeLog
index 1ba2a5da5900a324002bb24d87a1d3639f9f6f22..4d899d530afef9f0b03546577606d59bae858d12 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-01-07  Csaba Henk <csaba.henk@creo.hu>
+
+       * lib/mount_bsd.c:
+       - refine device closing in a race-free way
+       - add support for "-osubtype" on FreeBSD
+
+       * makeconf.sh: make it work under FreeBSD
+
 2008-01-03  Csaba Henk <csaba.henk@creo.hu>
 
        * lib/mount_bsd.c: close device before unmount

diff --git a/makeconf.sh b/makeconf.sh
index f21378d85bf6806e7c331436a0b1caafa53658ee..179cd68cb2bd5e3c22e81e54efc2d2b24d66ea79 100755 (executable)
--- a/makeconf.sh
+++ b/makeconf.sh
@@ -3,7 +3,21 @@
 echo Running libtoolize...
 libtoolize --automake -c -f
 
-cp /usr/share/gettext/config.rpath .
+CONFIG_RPATH=/usr/share/gettext/config.rpath
+if ! [ -f $CONFIG_RPATH ]; then
+    CONFIG_RPATH=/usr/local/share/gettext/config.rpath
+fi
+if ! [ -f $CONFIG_RPATH ]; then
+    if  [ -f config.rpath ]; then
+        CONFIG_RPATH=
+    else
+        echo "config.rpath not found!" >&2
+        exit 1
+    fi
+fi
+if ! [ -z "$CONFIG_RPATH" ]; then
+    cp "$CONFIG_RPATH" .
+fi
 
 if test ! -z "`which autoreconf`"; then
     echo Running autoreconf...