Stop using short library name for layout as the default name is already 8 chars.

Thanks to Michael Kaply <mkaply@us.ibm.com> for the patch.
Bug #190483 r=cls a=dbaron

layout/build/Makefile.in

@@ -31,9 +31,6 @@ BUILD_DATE = gbdate.h
 MODULE		= layout
 LIBRARY_NAME	= gklayout
 EXPORT_LIBRARY = 1
-ifneq ($(OS_ARCH),WINNT)
-SHORT_LIBNAME	= gkhtml
-endif
 IS_COMPONENT	= 1
 MODULE_NAME	= nsLayoutModule
 GRE_MODULE	= 1

xpinstall/packager/os2/browser.jst

@@ -29,6 +29,7 @@ function upgradeCleanup()
   deleteThisFile("Components", "gkcontent.dll");
   deleteThisFile("Chrome",     "chrome.rdf");
   deleteThisFolder("Chrome",   "overlayinfo");
+  deleteThisFile("Components", "gkhtml.dll");
 }
 
 // main

xpinstall/packager/packages-os2

@@ -135,8 +135,7 @@ bin/components/content_html.xpt
 bin/components/content_xslt.xpt
 bin/components/xuldoc.xpt
 bin/components/xultmpl.xpt
-;bin/components/gklayout.dll
-bin/components/gkhtml.dll
+bin/components/gklayout.dll
 bin/components/gkparser.dll
 bin/components/gkplugin.dll
 bin/components/gkview.dll