--- configure.orig	Tue May 24 19:14:40 2005
+++ configure	Mon Jun 13 23:57:03 2005
@@ -1,12 +1,12 @@
-#!/bin/bash
+#!/bin/sh
 
 MAKE=make
-which gmake >& /dev/null
+which gmake > /dev/null
 if [ $? = 0 ]; then
   MAKE=gmake
 fi
 
-uname | grep FreeBSD >& /dev/null
+uname | grep FreeBSD > /dev/null
 if [ $? = 0 ]; then
   FREEBSD=1
 else
@@ -50,7 +50,7 @@
 
 bindir=$prefix/bin
 datadir=$prefix/share
-mandir=$datadir/man
+mandir=$prefix/man
 libdir=$prefix/lib
 includedir=$prefix/include
 GCIN_VERSION=`cat VERSION.gcin`
@@ -61,7 +61,7 @@
   OPTFLAGS="-O"
 fi
 
-echo "CC=gcc" > config.mak
+echo "CC=$CC" > config.mak
 echo "MAKE=$MAKE" >> config.mak
 echo "GTKINC=$GTKINC" >> config.mak
 echo "prefix=$prefix" >> config.mak
@@ -81,8 +81,8 @@
 echo "GCIN_SCRIPT_DIR=\$(datadir_r)/gcin/script" >> config.mak
 echo "GCIN_SCRIPT_DIR_i=\$(datadir)/gcin/script" >> config.mak
 echo "OPTFLAGS=$OPTFLAGS" >> config.mak
-echo "DOC_DIR=\$(datadir_r)/doc/gcin-$GCIN_VERSION" >> config.mak
-echo "DOC_DIR_i=\$(datadir)/doc/gcin-$GCIN_VERSION" >> config.mak
+echo "DOC_DIR=\$(datadir_r)/doc/gcin" >> config.mak
+echo "DOC_DIR_i=\$(datadir)/doc/gcin" >> config.mak
 echo "GCIN_ICON_DIR=\$(datadir_r)/icons/gcin" >> config.mak
 echo "SYS_ICON_DIR=\$(datadir_r)/icons" >> config.mak
 echo "GCIN_ICON_DIR_i=\$(datadir)/icons/gcin" >> config.mak