3 files changed, 17 insertions, 8 deletions
diff --git a/libraries/goffice/README b/libraries/goffice/README
index 27b12e93752c0..1678137a54df9 100644
--- a/libraries/goffice/README
+++ b/libraries/goffice/README
@@ -1,3 +1 @@
 GOffice -- A glib/gtk set of document centric objects and utilities
-
-In order to compile (not to run), intltool is required.
diff --git a/libraries/goffice/goffice.SlackBuild b/libraries/goffice/goffice.SlackBuild
index 908332d2fc160..7cb0d9b7627a2 100644
--- a/libraries/goffice/goffice.SlackBuild
+++ b/libraries/goffice/goffice.SlackBuild
@@ -36,11 +36,14 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
-	SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
-	SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-	SLKCFLAGS="-O2 -fPIC"
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e
@@ -61,6 +64,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
 
diff --git a/libraries/goffice/slack-desc b/libraries/goffice/slack-desc
index 93eb606271167..1141b17a7760d 100644
--- a/libraries/goffice/slack-desc
+++ b/libraries/goffice/slack-desc
@@ -1,4 +1,11 @@
-       |-----handy-ruler----------------------------------------------------|
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+       |-----handy-ruler-------------------------------------------------------|
 goffice: GOffice (document utilities)
 goffice:
 goffice: GOffice is a glib/gtk set of document centric 
@@ -7,6 +14,6 @@ goffice:
 goffice: Homepage: http://ftp.gnome.org/pub/GNOME/sources/goffice/
 goffice:
 goffice:
-goffice:  
-goffice:  
+goffice:
+goffice:
 goffice: