diff --git a/buildpkg.packaging.solaris b/buildpkg.packaging.solaris
index ca6b48e..86cdc2d 100644
--- a/buildpkg.packaging.solaris
+++ b/buildpkg.packaging.solaris
@@ -476,29 +476,16 @@ generic_pack()
 	error $E_ARG_OBSO generic_pack
     fi
     clean meta
-    if [ "$shortroot" -eq 1 ]; then
-	if [ -d "${stagedir}/${_mandir}" ]; then
-	    setdir ${stagedir}/${_mandir}
-	    [ "$catman" -eq 1 ] && fix_man
-	    [ "$gzman" -eq 1 ] && compress_man
-	fi
-	if [ -d "${stagedir}/${_infodir}" ]; then
-	    setdir ${stagedir}${topinstalldir}${dir_prefix}/${_infodir}
-	    [ "$gzinfo" -eq 1 ] && compress_info
-	fi
-	setdir "$stagedir"
-    else
-	if [ -d "${stagedir}${topinstalldir}${dir_prefix}/${_mandir}" ]; then
-	    setdir ${stagedir}${topinstalldir}${dir_prefix}/${_mandir}
-	    [ "$catman" -eq 1 ] && fix_man
-	    [ "$gzman" -eq 1 ] && compress_man
-	fi
-	if [ -d "${stagedir}${topinstalldir}${dir_prefix}/${_infodir}" ]; then
-	    setdir ${stagedir}${topinstalldir}${dir_prefix}/${_infodir}
-	    [ "$gzinfo" -eq 1 ] && compress_info
-	fi
-	setdir "${stagedir}${prefix}"
+    if [ -d "${stagedir}${topinstalldir}${dir_prefix}/${_mandir}" ]; then
+	setdir ${stagedir}${topinstalldir}${dir_prefix}/${_mandir}
+	[ "$catman" -eq 1 ] && fix_man
+	[ "$gzman" -eq 1 ] && compress_man
     fi
+    if [ -d "${stagedir}${topinstalldir}${dir_prefix}/${_infodir}" ]; then
+	setdir ${stagedir}${topinstalldir}${dir_prefix}/${_infodir}
+	[ "$gzinfo" -eq 1 ] && compress_info
+    fi
+    setdir "${stagedir}${prefix}"
     parse_def
     check_unpackaged
     # Create a list of all the packages that we are going to build