--- build.sh.orig	2006-02-06 12:45:37.000000000 -0500
+++ build.sh	2006-02-06 13:42:35.000000000 -0500
@@ -32,6 +32,9 @@
  src/plugins/cantushashvalue.c\
  src/plugins/editarea.cc\
  src/plugins/genreselector.cc"
+PLUGIN_TAG2FILENAME="src/plugins/cantushash.c\
+ src/plugins/cantushashvalue.c\
+ src/plugins/genreselector.cc"
 
 # Program files.
 FILES="src/plugins/cantushash.c src/plugins/cantushashvalue.c\
@@ -165,15 +168,11 @@
 done
 
 INST_BINDIR="$INST_PREFIX/bin/"
-INST_LIBDIR="$INST_PREFIX/lib/$EXECUTABLE"
+INST_LIBDIR="$INST_PREFIX/$GENTOO_LIBDIR/$EXECUTABLE"
 INST_LOCALEDIR="$INST_PREFIX/share/locale"
-INST_PIXMAPDIR="$INST_PREFIX/lib/$EXECUTABLE"
+INST_PIXMAPDIR="$INST_PREFIX/$GENTOO_LIBDIR/$EXECUTABLE"
 INST_DOCDIR="$INST_PREFIX/doc/$EXECUTABLE"
-if [ -d "/usr/share/gnome/help/" ]; then
-  INST_GNOMEDOCDIR="/usr/share/gnome/help/$EXECUTABLE/C"
-else
-  INST_GNOMEDOCDIR="/usr/local/share/gnome/help/$EXECUTABLE/C"
-fi
+INST_GNOMEDOCDIR="$INST_PREFIX/share/gnome/help/$EXECUTABLE/C"
 
 # Preprocessor macros:
 MACROS="PACKAGE_LIB_DIR=$INST_LIBDIR/\