From: Bruno Haible <bruno@clisp.org>
Date: Mon, 7 Apr 2003 10:40:26 +0000 (+0000)
Subject: Make it work also when no --prefix option was given.
X-Git-Tag: v0.12~97
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50dfa9342cf525c7266e6ba19003f76860bc1391;p=thirdparty%2Fgettext.git

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

diff --git a/gettext-tools/m4/ChangeLog b/gettext-tools/m4/ChangeLog
index c843a24db..76c44bb34 100644
--- 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 94e1dca8d..d8888989e 100644
--- 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.])
 ])