From 93bbd7fda1dd9ee975bce092f7edf10da479662a Mon Sep 17 00:00:00 2001 From: Csaba Henk Date: Mon, 7 Jan 2008 11:18:33 +0000 Subject: [PATCH] make makeconf.sh work under FreeBSD --- ChangeLog | 8 ++++++++ makeconf.sh | 16 +++++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1ba2a5d..4d899d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-01-07 Csaba Henk + + * 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 * lib/mount_bsd.c: close device before unmount diff --git a/makeconf.sh b/makeconf.sh index f21378d..179cd68 100755 --- 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... -- 2.30.2