Alexandre Julliard : configure: Add explicit install targets in libs/ wine for make_makefiles.
Alexandre Julliard
julliard at winehq.org
Mon May 13 15:02:44 CDT 2013
Module: wine
Branch: master
Commit: ce4b6451aabbe83809c7483c748cfa009cc090d6
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce4b6451aabbe83809c7483c748cfa009cc090d6
Author: Alexandre Julliard <julliard at winehq.org>
Date: Fri May 10 22:01:44 2013 +0200
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 d4c1f8e..ef38bfd 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 6dd2348..b44673e 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 b8dc385..7de7799 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@
More information about the wine-cvs
mailing list