Make it work also when no --prefix option was given.

diff --git a/gettext-tools/m4/ChangeLog b/gettext-tools/m4/ChangeLog
index c843a24dba6589c5fb3b3034f4af30341df3a82f..76c44bb3427f2946df67289de5dc72e9ccce8f31 100644 (file)
--- a/gettext-tools/m4/ChangeLog
+++ b/gettext-tools/m4/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-05  Bruno Haible  <bruno@clisp.org>
+
+       * relocatable.m4 (AC_RELOCATABLE_LIBRARY): Use the final value of
+       ${prefix}, not the current value.
+
 2003-03-18  Bruno Haible  <bruno@clisp.org>
 
        * onceonly.m4: Update from gnulib.

diff --git a/gettext-tools/m4/relocatable.m4 b/gettext-tools/m4/relocatable.m4
index 94e1dca8da440d8a763977bd7df76fd72771a299..d8888989ec595f08d7b3659eaa4340d3acf1770e 100644 (file)
--- a/gettext-tools/m4/relocatable.m4
+++ b/gettext-tools/m4/relocatable.m4
@@ -64,7 +64,12 @@ AC_DEFUN([AC_RELOCATABLE_LIBRARY],
     ], RELOCATABLE=no)
   AC_SUBST(RELOCATABLE)
   dnl Easier to put this here once, instead of into the DEFS of each Makefile.
-  AC_DEFINE_UNQUOTED([INSTALLPREFIX], ["${prefix}"],
+  if test "X$prefix" = "XNONE"; then
+    reloc_final_prefix="$ac_default_prefix"
+  else
+    reloc_final_prefix="$prefix"
+  fi
+  AC_DEFINE_UNQUOTED([INSTALLPREFIX], ["${reloc_final_prefix}"],
     [Define to the value of ${prefix}, as a string.])
 ])