[gpm]gpm configure prefix bug *FIXED* (from BUGS file)

Scott Bartlett srb@REMOVE_SPAM.mnsolutions.com
Fri, 15 Nov 2002 21:08:37 -0500


This patch fixes the SBINDIR and SYSCONFDIR ${prefix} bug in "configure"
as described by the BUGS file.


======================= START PATCH ================================
--- ../cvs/gpm/configure        2002-05-29 05:12:23.000000000 -0400
+++ configure   2002-11-15 20:51:03.000000000 -0500
@@ -1946,14 +1946,6 @@
   CPPFLAGS='-I$(srcdir) $(DEFS) -include headers/config.h -Wall'
   LDFLAGS='-L$(srcdir)'

-cat >> confdefs.h <<EOF
-#define SYSCONFDIR "$sysconfdir"
-EOF
-
-cat >> confdefs.h <<EOF
-#define SBINDIR "$sbindir"
-EOF
-
   trap '' 1 2 15
   cat > confcache <<\EOF
   # This file is a shell script that caches the results of configure
@@ -2006,7 +1998,15 @@

   test "x$prefix" = xNONE && prefix=$ac_default_prefix
   # Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+test "x$exec_prefix" = xNONE && exec_prefix=${prefix}
+
+cat >> confdefs.h <<EOF
+#define SYSCONFDIR "`eval echo $sysconfdir`"
+EOF
+
+cat >> confdefs.h <<EOF
+#define SBINDIR "`eval echo $sbindir`"
+EOF

   # Any assignment to VPATH causes Sun make to only execute
   # the first set of double-colon rules, so remove it if not needed.
============================ END PATCH =============================

Scott Bartlett