--- WordNet/configure.ac
+++ WordNet/configure.ac
@@ -33,11 +33,7 @@ SC_LOAD_TCLCONFIG
 SC_LOAD_TKCONFIG
 
 # Set default installation prefix.
-AC_PREFIX_DEFAULT([/usr/local/WordNet-3.0])
-ac_prefix=$prefix
-if test "x$ac_prefix" = "xNONE"; then
-    ac_prefix=$ac_default_prefix
-fi
+ac_prefix=$datadir/wordnet
 AC_SUBST(ac_prefix)
 AH_TEMPLATE([DEFAULTPATH],[The default search path for WordNet data files])
 AC_DEFINE_UNQUOTED(DEFAULTPATH, ["$ac_prefix/dict"], [Default installation prefix.])
@@ -66,7 +62,7 @@ WordNet is now configured
   To run, environment variables should be set as follows:
 
     PATH - include ${bindir}
-    WNHOME - if not using default installation location, set to ${prefix}
+    WNHOME - if not using default installation location, set to ${ac_prefix}
 
     See INSTALL file for details and additional environment variables
     which may need to be set on your system.
--- WordNet/dict/Makefile.am
+++ WordNet/dict/Makefile.am
@@ -1,2 +1,2 @@
-dictdir = $(prefix)/dict
+dictdir = $(ac_prefix)/dict
 dict_DATA = adj.exc adv.exc cntlist cntlist.rev data.adj data.adv data.noun data.verb frames.vrb index.adj index.adv index.noun index.sense index.verb log.grind.3.0 noun.exc sentidx.vrb sents.vrb verb.Framestext verb.exc lexnames
--- WordNet/lib/wnres/Makefile.am
+++ WordNet/lib/wnres/Makefile.am
@@ -1,3 +1,3 @@
 EXTRA_DIST = license.txt wn.xbm wnb.man wngloss.man
-wnresdir = $(prefix)/lib/wnres
+wnresdir = $(ac_prefix)/wnres
 wnres_DATA = license.txt wn.xbm wnb.man wngloss.man
--- WordNet/src/wnb
+++ WordNet/src/wnb
@@ -103,7 +103,7 @@ set version "3.0"
 
 if {$tcl_platform(platform) == "unix"} {
    if {[lsearch -exact [array names env] WNHOME] == -1} {
-	set resourcedir "/usr/local/WordNet-3.0/lib/wnres"
+	set resourcedir "/usr/share/wordnet/wnres"
    } else {
 	set resourcedir "$env(WNHOME)/lib/wnres"
    }