ooo-build r13431 - trunk/bin

[rengelhard svn gnome org]

Author: rengelhard
Date: Wed Jul 30 00:24:46 2008
New Revision: 13431
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13431&view=rev

Log:
fix help moving; adapt for en-US/en

Modified:
   trunk/bin/package-ooo

Modified: trunk/bin/package-ooo
==============================================================================
--- trunk/bin/package-ooo	(original)
+++ trunk/bin/package-ooo	Wed Jul 30 00:24:46 2008
@@ -911,9 +911,10 @@
 		fi
 		# some help files are in _Langpack_{Writer,Impress,...}_<lang>
 		# move them from -l10n to -help
-		mv pkg/openoffice.org-l10n-$l/$OOINSTBASE/basis$VERSION/help/$l/*
-			pkg/openoffice.org-help-$l/$OOINSTBASE/basis$VERSION/help/$l && \
-		rmdir pkg/openoffice.org-l10n-$l/$OOINSTBASE/basis$VERSION/help/$l
+		if [ "$l" = "en-US" ]; then d=en; else d=$l; fi
+		mv pkg/openoffice.org-l10n-$l/$OOINSTBASE/basis$VERSION/help/$d/* \
+			pkg/openoffice.org-help-$l/$OOINSTBASE/basis$VERSION/help/$d && \
+		rmdir pkg/openoffice.org-l10n-$l/$OOINSTBASE/basis$VERSION/help/$d
 	done
 
 	# move_wrappers <directory_name> <name> [...]