From ce4b6451aabbe83809c7483c748cfa009cc090d6 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard <julliard@winehq.org> Date: Fri, 10 May 2013 22:01:44 +0200 Subject: [PATCH] configure: Add explicit install targets in libs/wine for make_makefiles. --- configure | 2 +- configure.ac | 2 +- libs/wine/Makefile.in | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/configure b/configure index d4c1f8edf37..ef38bfd4308 100755 --- a/configure +++ b/configure @@ -16379,7 +16379,7 @@ wine_fn_config_makefile documentation enable_documentation wine_fn_config_makefile fonts enable_fonts install-lib wine_fn_config_makefile include enable_include install-dev wine_fn_config_makefile libs/port enable_libs_port -wine_fn_config_makefile libs/wine enable_libs_wine +wine_fn_config_makefile libs/wine enable_libs_wine install-dev,install-lib wine_fn_config_makefile libs/wpp enable_libs_wpp wine_fn_config_makefile loader enable_loader install-lib,manpage wine_fn_config_program aspnet_regiis enable_aspnet_regiis install diff --git a/configure.ac b/configure.ac index 6dd23487e1e..b44673e3e6e 100644 --- a/configure.ac +++ b/configure.ac @@ -3173,7 +3173,7 @@ WINE_CONFIG_MAKEFILE([documentation]) WINE_CONFIG_MAKEFILE([fonts],,[install-lib]) WINE_CONFIG_MAKEFILE([include],,[install-dev]) WINE_CONFIG_MAKEFILE([libs/port]) -WINE_CONFIG_MAKEFILE([libs/wine]) +WINE_CONFIG_MAKEFILE([libs/wine],,[install-dev,install-lib]) WINE_CONFIG_MAKEFILE([libs/wpp]) WINE_CONFIG_MAKEFILE([loader],,[install-lib,manpage]) WINE_CONFIG_PROGRAM(aspnet_regiis,,[install]) diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index b8dc3854b20..7de779967f2 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -111,4 +111,8 @@ version.c: dummy $(RELPATH): @cd $(TOOLSDIR)/tools && $(MAKE) relpath$(TOOLSEXT) +# Make sure that make_makefiles sees the install rules +install install-lib:: +install install-dev:: + @LIBWINE_RULES@ -- GitLab