Chip Davis : build: Make the sed(1) command more portable.

Alexandre Julliard julliard at winehq.org
Thu Aug 16 13:42:21 CDT 2018


Module: vkd3d
Branch: master
Commit: 923ec78c019bbf6b12b5afc96332c1d01f2f189b
URL:    https://source.winehq.org/git/vkd3d.git/?a=commit;h=923ec78c019bbf6b12b5afc96332c1d01f2f189b

Author: Chip Davis <cdavis at codeweavers.com>
Date:   Fri Aug 10 16:01:29 2018 -0500

build: Make the sed(1) command more portable.

BSD sed(1) requires an argument after -i giving the suffix to put on the
backup it makes. Also, the regular expression given doesn't seem to work
for me. This command should work everywhere.

Signed-off-by: Chip Davis <cdavis at codeweavers.com>
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 Makefile.am | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 14f2d51..770b6e0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -150,8 +150,9 @@ vkd3d_v_widl_1 =
 EXTRA_DIST += $(widl_headers) $(widl_headers:.h=.idl)
 $(widl_headers): %.h: %.idl
 if HAVE_WIDL
-	$(VKD3D_V_WIDL)$(WIDL) -o $@ $<
-	sed -e '/#include <\(rpc.h\|rpcndr.h\)>/d' -i $@
+	$(VKD3D_V_WIDL)$(WIDL) -h -o [email protected] $<
+	$(SED) -e '/#include <rpc.h>/d' -e '/#include <rpcndr.h>/d' <[email protected] >$@
+	$(RM) [email protected]
 else
 	echo "widl is required to generate $<"
 endif




More information about the wine-cvs mailing list