Rebase against 4e9cc305bb1a758eb70419318c7c41c2918fc180.

This commit is contained in:
Sebastian Lackner
2016-09-13 23:52:10 +02:00
parent 3bb2024464
commit 79af70fad1
4 changed files with 21 additions and 21 deletions

View File

@@ -1,4 +1,4 @@
From 57f3079d00eb226013528e2171e19f9aa7e31282 Mon Sep 17 00:00:00 2001
From 4dfeafbe2c75253ecca37810fa7351e326e9e310 Mon Sep 17 00:00:00 2001
From: "Erich E. Hoover" <erich.e.hoover@wine-staging.com>
Date: Tue, 15 Sep 2015 17:44:33 -0600
Subject: msidb: Add stub tool for manipulating MSI databases.
@@ -13,17 +13,17 @@ Signed-off-by: Erich E. Hoover <erich.e.hoover@wine-staging.com>
create mode 100644 programs/msidb/main.c
diff --git a/configure.ac b/configure.ac
index 9e0dcd9..7989ec6 100644
index ac75845..71a245d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3474,6 +3474,7 @@ WINE_CONFIG_PROGRAM(ipconfig,,[clean,install])
@@ -3522,6 +3522,7 @@ WINE_CONFIG_PROGRAM(ipconfig,,[clean,install])
WINE_CONFIG_PROGRAM(lodctr,,[install])
WINE_CONFIG_PROGRAM(mofcomp,,[install])
WINE_CONFIG_PROGRAM(mshta,,[install])
+WINE_CONFIG_PROGRAM(msidb,,[install,installbin])
WINE_CONFIG_PROGRAM(msiexec,,[install,installbin,manpage])
WINE_CONFIG_PROGRAM(msinfo32,,[install])
WINE_CONFIG_PROGRAM(net,,[clean,install])
WINE_CONFIG_PROGRAM(netsh,,[install])
diff --git a/programs/msidb/Makefile.in b/programs/msidb/Makefile.in
new file mode 100644
index 0000000..dae699c
@@ -198,5 +198,5 @@ index 0000000..43cc519
+ return 0;
+}
--
2.7.1
2.9.0