patches/evolution-02-solaris-sed.diff
author rohinis
Tue, 29 Nov 2011 17:32:55 +0000
branchs11express-2010-11
changeset 22234 c23e64da3e06
parent 17348 63933167ebde
permissions -rw-r--r--
2011-11-29 Rohini S <[email protected]> * patches/Python26-22-audio.diff: Fixes CVE-2010-1634 * specs/SUNWPython26.spec: Fixes CR 7085446
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
17348
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
     1
--- evolution-2.4.1/plugin.mk	2006-07-21 11:01:02.841254000 +0800
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
     2
+++ evolution-2.4.1/plugin.mk.bak	2006-07-21 11:11:37.458252000 +0800
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
     3
@@ -1,8 +1,8 @@
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
     4
 %.eplug: %.eplug.in
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
     5
-	sed -e 's|\@PLUGINDIR\@|$(plugindir)|'		\
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
     6
+	/usr/xpg4/bin/sed -e 's|\@PLUGINDIR\@|$(plugindir)|'		\
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
     7
 	-e 's|\@SOEXT\@|$(SOEXT)|'			\
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
     8
 	-e 's|\@GETTEXT_PACKAGE\@|$(GETTEXT_PACKAGE)|'	\
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
     9
-	-e 's|\@LOCALEDIR\@|$(localedir)|' $< > $@
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
    10
+	-e 's|\@LOCALEDIR\@|$(localedir)|' $< > $@ 2>/dev/null;echo ""
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
    11
 
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
    12
 %.eplug.in: %.eplug.xml
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
    13
 	LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@