From bff92e3d44a6148d9079a64269c05db2bf15eb82 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sat, 24 Oct 2015 02:12:04 +0200 Subject: [PATCH] msidb-Implementation: Add missing changes to tools/make_makefiles. --- ...-tool-for-manipulating-MSI-databases.patch | 23 +++++++++++++++---- patches/patchinstall.sh | 2 +- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/patches/msidb-Implementation/0001-msidb-Add-stub-tool-for-manipulating-MSI-databases.patch b/patches/msidb-Implementation/0001-msidb-Add-stub-tool-for-manipulating-MSI-databases.patch index 2186e78a..b70eb087 100644 --- a/patches/msidb-Implementation/0001-msidb-Add-stub-tool-for-manipulating-MSI-databases.patch +++ b/patches/msidb-Implementation/0001-msidb-Add-stub-tool-for-manipulating-MSI-databases.patch @@ -1,4 +1,4 @@ -From b2940fd680565f442be117c077547c62090cfd3c Mon Sep 17 00:00:00 2001 +From 8a68964092d39388b5e4147796b8b88affd960e1 Mon Sep 17 00:00:00 2001 From: "Erich E. Hoover" Date: Tue, 15 Sep 2015 17:44:33 -0600 Subject: msidb: Add stub tool for manipulating MSI databases. @@ -8,15 +8,16 @@ Signed-off-by: Erich E. Hoover configure.ac | 1 + programs/msidb/Makefile.in | 6 ++ programs/msidb/main.c | 153 +++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 160 insertions(+) + tools/make_makefiles | 1 + + 4 files changed, 161 insertions(+) create mode 100644 programs/msidb/Makefile.in create mode 100644 programs/msidb/main.c diff --git a/configure.ac b/configure.ac -index 135268f..ed0a472 100644 +index bfcf319..b75fe09 100644 --- a/configure.ac +++ b/configure.ac -@@ -3503,6 +3503,7 @@ WINE_CONFIG_PROGRAM(ipconfig,,[install,po]) +@@ -3523,6 +3523,7 @@ WINE_CONFIG_PROGRAM(ipconfig,,[install,po]) WINE_CONFIG_PROGRAM(lodctr,,[install]) WINE_CONFIG_PROGRAM(mofcomp,,[install]) WINE_CONFIG_PROGRAM(mshta,,[install]) @@ -195,6 +196,18 @@ index 0000000..43cc519 + close_database( &state ); + return 0; +} +diff --git a/tools/make_makefiles b/tools/make_makefiles +index 266f33a..90234f9 100755 +--- a/tools/make_makefiles ++++ b/tools/make_makefiles +@@ -24,6 +24,7 @@ use strict; + # Programs that we want to install in the bin directory too + my %bin_install = + ( ++ "msidb" => 1, + "msiexec" => 1, + "notepad" => 1, + "regedit" => 1, -- -2.5.1 +2.6.1 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index a54864dd..6df86f1c 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -3731,7 +3731,7 @@ fi # | # | Modified files: # | * configure.ac, dlls/msi/database.c, dlls/msi/msipriv.h, dlls/msi/streams.c, dlls/msi/suminfo.c, -# | programs/msidb/Makefile.in, programs/msidb/main.c +# | programs/msidb/Makefile.in, programs/msidb/main.c, tools/make_makefiles # | if test "$enable_msidb_Implementation" -eq 1; then patch_apply msidb-Implementation/0001-msidb-Add-stub-tool-for-manipulating-MSI-databases.patch