[PATCH vkd3d v4 2/7] build: Make the sed(1) command more portable.

Chip Davis cdavis at codeweavers.com
Fri Aug 10 16:01:29 CDT 2018


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>
---

Notes:
    Try 3: Remove possibly redundant and/or unsupported '-f' option. The
           definition of RM might already have it, or even be something (like
           the DEL command on Windows) which doesn't support it.
    
    (As if anyone would want to build this on Windows... :)
    
    Try 4: We're not specifying a recognized extension to widl(1) anymore,
           so we need to explicitly tell it to generate a header now.

 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
-- 
2.18.0




More information about the wine-devel mailing list