[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

./packages/openofficeorg/3.0.1/unstable r1460: handle stuff from DEB_BUILD_OPTIONS *after* lang=xx...



------------------------------------------------------------
revno: 1460
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Wed 2009-04-15 12:07:06 +0200
message:
  handle stuff from DEB_BUILD_OPTIONS *after* lang=xx...
modified:
  rules
=== modified file 'rules'
--- a/rules	2009-04-15 10:02:51 +0000
+++ b/rules	2009-04-15 10:07:06 +0000
@@ -507,9 +507,9 @@
 
 ifneq "$(BUILD_ONLY_EN_US)" "y"
   ifeq (lang=,$(findstring lang=,$(DEB_BUILD_OPTIONS)))
-	ISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n 's/^.*lang=\([^\s]*\)\s.*/\1/p' | sed -e 's/,/ /')
-	HELPISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n 's/^.*lang=\([^,\s*\)\s.*/\1/p' | sed -e 's/,/ /')
-	LANGPACKISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n 's/^.*lang=\([^\s]*\)\s.*/\1/p' | sed -e 's/,/ /')
+	ISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n 's/^.*lang=\([^\s]*\)\s.*/\1/p' | awk '{ print $$1 }' | sed -e 's/,/ /')
+	HELPISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n 's/^.*lang=\([^,\s*\)\s.*/\1/p' | awk '{ print $$1 }' | sed -e 's/,/ /')
+	LANGPACKISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n 's/^.*lang=\([^\s]*\)\s.*/\1/p' | awk '{ print $$1 }' | sed -e 's/,/ /')
   else
 	# Note that the first one here *has to be* en-US. the first one gets
 	# gid_Module_Root as filelist later and the rest gid_Module_Root.$iso


Reply to: