[PATCH 2/2] wineboot: Use PACKAGE_BUGREPORT instead of hardcoding it.
Francois Gouget
fgouget at free.fr
Sat May 16 05:22:24 CDT 2020
Using config.h is not allowed when cross-compiling so wineboot must get
the PACKAGE_BUGREPORT from its own .h.in file.
Signed-off-by: Francois Gouget <fgouget at free.fr>
---
programs/wineboot/Makefile.in | 3 +++
programs/wineboot/{resource.h => resource.h.in} | 3 +++
programs/wineboot/wineboot.c | 2 +-
3 files changed, 7 insertions(+), 1 deletion(-)
rename programs/wineboot/{resource.h => resource.h.in} (88%)
diff --git a/programs/wineboot/Makefile.in b/programs/wineboot/Makefile.in
index 3921fa96444..b3f3db5f4e7 100644
--- a/programs/wineboot/Makefile.in
+++ b/programs/wineboot/Makefile.in
@@ -9,6 +9,9 @@ C_SRCS = \
shutdown.c \
wineboot.c
+IN_SRCS = \
+ resource.h.in
+
RC_SRCS = wineboot.rc
MANPAGES = wineboot.man.in
diff --git a/programs/wineboot/resource.h b/programs/wineboot/resource.h.in
similarity index 88%
rename from programs/wineboot/resource.h
rename to programs/wineboot/resource.h.in
index 4ff3c69e2d5..6be109e2a8a 100644
--- a/programs/wineboot/resource.h
+++ b/programs/wineboot/resource.h.in
@@ -25,3 +25,6 @@
#define IDD_ENDTASK 100
#define IDD_WAITDLG 101
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "@PACKAGE_BUGREPORT@"
diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c
index ac0b04d6d81..ec0732edcd8 100644
--- a/programs/wineboot/wineboot.c
+++ b/programs/wineboot/wineboot.c
@@ -891,7 +891,7 @@ static BOOL pendingRename(void)
if( res!=ERROR_SUCCESS )
{
WINE_ERR("Couldn't query value after successfully querying before (%u),\n"
- "please report to wine-devel at winehq.org\n", res);
+ "please report to %s\n", res, PACKAGE_BUGREPORT);
res=FALSE;
goto end;
}
--
2.20.1
More information about the wine-devel
mailing list