From 41107a940f59302ae93145727e6a7ba590fe7671 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Mon, 1 Aug 2011 13:40:19 +0200 Subject: [PATCH] makefiles: Also install the program manpages from the top-level makefile. --- Makefile.in | 3 ++- aclocal.m4 | 9 ++++++++ configure | 49 ++++++++++++++++++++++++++------------------ configure.ac | 40 ++++++++++++++++++------------------ tools/make_makefiles | 3 ++- 5 files changed, 62 insertions(+), 42 deletions(-) diff --git a/Makefile.in b/Makefile.in index 056754b6bfe..723bd826fe9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -29,7 +29,8 @@ EXTRASUBDIRS = \ INSTALLDIRS = \ $(DESTDIR)$(bindir) \ $(DESTDIR)$(dlldir) \ - $(DESTDIR)$(fakedlldir) + $(DESTDIR)$(fakedlldir) \ + $(DESTDIR)$(mandir)/man$(prog_manext) all: wine @echo "Wine build complete." diff --git a/aclocal.m4 b/aclocal.m4 index 948dd7f599b..41274ad43d3 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -477,6 +477,15 @@ $ac_dir/__uninstall__:: \$(INSTALL_PROGRAM) $ac_dir/$ac_program \$(DESTDIR)\$(dlldir)/$ac_program $ac_dir/__uninstall__:: \$(RM) \$(DESTDIR)\$(dlldir)/$ac_program" + fi + + if test "x$enable_tools" != xno && wine_fn_has_flag manpage $ac_flags + then + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"$ac_dir/__install__:: $ac_dir \$(DESTDIR)\$(mandir)/man\$(prog_manext) + \$(INSTALL_DATA) $ac_dir/$ac_name.man \$(DESTDIR)\$(mandir)/man\$(prog_manext)/$ac_name.\$(prog_manext) +$ac_dir/__uninstall__:: + \$(RM) \$(DESTDIR)\$(mandir)/man\$(prog_manext)/$ac_name.\$(prog_manext)" fi]) } diff --git a/configure b/configure index 264acaa59a3..130b4b3d701 100755 --- a/configure +++ b/configure @@ -14549,6 +14549,15 @@ $ac_dir/__uninstall__:: $ac_dir/__uninstall__:: \$(RM) \$(DESTDIR)\$(dlldir)/$ac_program" fi + + if test "x$enable_tools" != xno && wine_fn_has_flag manpage $ac_flags + then + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"$ac_dir/__install__:: $ac_dir \$(DESTDIR)\$(mandir)/man\$(prog_manext) + \$(INSTALL_DATA) $ac_dir/$ac_name.man \$(DESTDIR)\$(mandir)/man\$(prog_manext)/$ac_name.\$(prog_manext) +$ac_dir/__uninstall__:: + \$(RM) \$(DESTDIR)\$(mandir)/man\$(prog_manext)/$ac_name.\$(prog_manext)" + fi fi } @@ -15244,7 +15253,7 @@ 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 install-dev,install-lib wine_fn_config_makefile libs/wpp enable_libs_wpp -wine_fn_config_makefile loader enable_loader install-lib +wine_fn_config_makefile loader enable_loader install-lib,manpage wine_fn_config_program aspnet_regiis enable_aspnet_regiis install wine_fn_config_program attrib enable_attrib install wine_fn_config_program cabarc enable_cabarc install @@ -15267,20 +15276,20 @@ wine_fn_config_program ipconfig enable_ipconfig install,po wine_fn_config_program lodctr enable_lodctr install wine_fn_config_program mofcomp enable_mofcomp install wine_fn_config_program mshta enable_mshta install -wine_fn_config_program msiexec enable_msiexec install,installbin +wine_fn_config_program msiexec enable_msiexec install,installbin,manpage wine_fn_config_program net enable_net install,po wine_fn_config_program netsh enable_netsh install wine_fn_config_program ngen enable_ngen install -wine_fn_config_program notepad enable_notepad install,installbin,po +wine_fn_config_program notepad enable_notepad install,installbin,manpage,po wine_fn_config_program oleview enable_oleview install,po wine_fn_config_program ping enable_ping install wine_fn_config_program plugplay enable_plugplay install wine_fn_config_program progman enable_progman install,po wine_fn_config_program reg enable_reg install,po -wine_fn_config_program regedit enable_regedit install,installbin,po +wine_fn_config_program regedit enable_regedit install,installbin,manpage,po wine_fn_config_test programs/regedit/tests regedit.exe_test wine_fn_config_program regsvcs enable_regsvcs install -wine_fn_config_program regsvr32 enable_regsvr32 install,installbin +wine_fn_config_program regsvr32 enable_regsvr32 install,installbin,manpage wine_fn_config_program rpcss enable_rpcss install wine_fn_config_program rundll.exe16 enable_win16 install wine_fn_config_program rundll32 enable_rundll32 install @@ -15297,17 +15306,17 @@ wine_fn_config_program termsv enable_termsv install wine_fn_config_program uninstaller enable_uninstaller install,po wine_fn_config_program unlodctr enable_unlodctr install wine_fn_config_program view enable_view po -wine_fn_config_program wineboot enable_wineboot install,installbin +wine_fn_config_program wineboot enable_wineboot install,installbin,manpage wine_fn_config_program winebrowser enable_winebrowser install -wine_fn_config_program winecfg enable_winecfg install,installbin,po -wine_fn_config_program wineconsole enable_wineconsole install,installbin,po -wine_fn_config_program winedbg enable_winedbg install,installbin,po +wine_fn_config_program winecfg enable_winecfg install,installbin,manpage,po +wine_fn_config_program wineconsole enable_wineconsole install,installbin,manpage,po +wine_fn_config_program winedbg enable_winedbg install,installbin,manpage,po wine_fn_config_program winedevice enable_winedevice install -wine_fn_config_program winefile enable_winefile install,installbin,po +wine_fn_config_program winefile enable_winefile install,installbin,manpage,po wine_fn_config_program winemenubuilder enable_winemenubuilder install -wine_fn_config_program winemine enable_winemine install,installbin,po +wine_fn_config_program winemine enable_winemine install,installbin,manpage,po wine_fn_config_program winemsibuilder enable_winemsibuilder install -wine_fn_config_program winepath enable_winepath install,installbin +wine_fn_config_program winepath enable_winepath install,installbin,manpage wine_fn_config_program winetest enable_winetest wine_fn_config_program winevdm enable_win16 install wine_fn_config_program winhelp.exe16 enable_win16 install @@ -15320,14 +15329,14 @@ wine_fn_config_program write enable_write install,po wine_fn_config_program wscript enable_wscript install wine_fn_config_test programs/wscript/tests wscript.exe_test wine_fn_config_program xcopy enable_xcopy install,po -wine_fn_config_makefile server enable_server install-lib -wine_fn_config_tool tools install-dev,install-lib -wine_fn_config_tool tools/widl install-dev -wine_fn_config_tool tools/winebuild install-dev -wine_fn_config_tool tools/winedump install-dev -wine_fn_config_tool tools/winegcc install-dev -wine_fn_config_tool tools/wmc install-dev -wine_fn_config_tool tools/wrc install-dev +wine_fn_config_makefile server enable_server install-lib,manpage +wine_fn_config_tool tools install-dev,install-lib,manpage +wine_fn_config_tool tools/widl install-dev,manpage +wine_fn_config_tool tools/winebuild install-dev,manpage +wine_fn_config_tool tools/winedump install-dev,manpage +wine_fn_config_tool tools/winegcc install-dev,manpage +wine_fn_config_tool tools/wmc install-dev,manpage +wine_fn_config_tool tools/wrc install-dev,manpage LINGUAS="\ ar \ diff --git a/configure.ac b/configure.ac index 2521c7181af..cb68b3bf128 100644 --- a/configure.ac +++ b/configure.ac @@ -2884,7 +2884,7 @@ WINE_CONFIG_MAKEFILE([include],,[install-dev]) WINE_CONFIG_MAKEFILE([libs/port]) WINE_CONFIG_MAKEFILE([libs/wine],,[install-dev,install-lib]) WINE_CONFIG_MAKEFILE([libs/wpp]) -WINE_CONFIG_MAKEFILE([loader],,[install-lib]) +WINE_CONFIG_MAKEFILE([loader],,[install-lib,manpage]) WINE_CONFIG_PROGRAM(aspnet_regiis,,[install]) WINE_CONFIG_PROGRAM(attrib,,[install]) WINE_CONFIG_PROGRAM(cabarc,,[install]) @@ -2907,20 +2907,20 @@ WINE_CONFIG_PROGRAM(ipconfig,,[install,po]) WINE_CONFIG_PROGRAM(lodctr,,[install]) WINE_CONFIG_PROGRAM(mofcomp,,[install]) WINE_CONFIG_PROGRAM(mshta,,[install]) -WINE_CONFIG_PROGRAM(msiexec,,[install,installbin]) +WINE_CONFIG_PROGRAM(msiexec,,[install,installbin,manpage]) WINE_CONFIG_PROGRAM(net,,[install,po]) WINE_CONFIG_PROGRAM(netsh,,[install]) WINE_CONFIG_PROGRAM(ngen,,[install]) -WINE_CONFIG_PROGRAM(notepad,,[install,installbin,po]) +WINE_CONFIG_PROGRAM(notepad,,[install,installbin,manpage,po]) WINE_CONFIG_PROGRAM(oleview,,[install,po]) WINE_CONFIG_PROGRAM(ping,,[install]) WINE_CONFIG_PROGRAM(plugplay,,[install]) WINE_CONFIG_PROGRAM(progman,,[install,po]) WINE_CONFIG_PROGRAM(reg,,[install,po]) -WINE_CONFIG_PROGRAM(regedit,,[install,installbin,po]) +WINE_CONFIG_PROGRAM(regedit,,[install,installbin,manpage,po]) WINE_CONFIG_TEST(programs/regedit/tests) WINE_CONFIG_PROGRAM(regsvcs,,[install]) -WINE_CONFIG_PROGRAM(regsvr32,,[install,installbin]) +WINE_CONFIG_PROGRAM(regsvr32,,[install,installbin,manpage]) WINE_CONFIG_PROGRAM(rpcss,,[install]) WINE_CONFIG_PROGRAM(rundll.exe16,enable_win16,[install]) WINE_CONFIG_PROGRAM(rundll32,,[install]) @@ -2937,17 +2937,17 @@ WINE_CONFIG_PROGRAM(termsv,,[install]) WINE_CONFIG_PROGRAM(uninstaller,,[install,po]) WINE_CONFIG_PROGRAM(unlodctr,,[install]) WINE_CONFIG_PROGRAM(view,,[po]) -WINE_CONFIG_PROGRAM(wineboot,,[install,installbin]) +WINE_CONFIG_PROGRAM(wineboot,,[install,installbin,manpage]) WINE_CONFIG_PROGRAM(winebrowser,,[install]) -WINE_CONFIG_PROGRAM(winecfg,,[install,installbin,po]) -WINE_CONFIG_PROGRAM(wineconsole,,[install,installbin,po]) -WINE_CONFIG_PROGRAM(winedbg,,[install,installbin,po]) +WINE_CONFIG_PROGRAM(winecfg,,[install,installbin,manpage,po]) +WINE_CONFIG_PROGRAM(wineconsole,,[install,installbin,manpage,po]) +WINE_CONFIG_PROGRAM(winedbg,,[install,installbin,manpage,po]) WINE_CONFIG_PROGRAM(winedevice,,[install]) -WINE_CONFIG_PROGRAM(winefile,,[install,installbin,po]) +WINE_CONFIG_PROGRAM(winefile,,[install,installbin,manpage,po]) WINE_CONFIG_PROGRAM(winemenubuilder,,[install]) -WINE_CONFIG_PROGRAM(winemine,,[install,installbin,po]) +WINE_CONFIG_PROGRAM(winemine,,[install,installbin,manpage,po]) WINE_CONFIG_PROGRAM(winemsibuilder,,[install]) -WINE_CONFIG_PROGRAM(winepath,,[install,installbin]) +WINE_CONFIG_PROGRAM(winepath,,[install,installbin,manpage]) WINE_CONFIG_PROGRAM(winetest) WINE_CONFIG_PROGRAM(winevdm,enable_win16,[install]) WINE_CONFIG_PROGRAM(winhelp.exe16,enable_win16,[install]) @@ -2960,14 +2960,14 @@ WINE_CONFIG_PROGRAM(write,,[install,po]) WINE_CONFIG_PROGRAM(wscript,,[install]) WINE_CONFIG_TEST(programs/wscript/tests) WINE_CONFIG_PROGRAM(xcopy,,[install,po]) -WINE_CONFIG_MAKEFILE([server],,[install-lib]) -WINE_CONFIG_TOOL(tools,[install-dev,install-lib]) -WINE_CONFIG_TOOL(tools/widl,[install-dev]) -WINE_CONFIG_TOOL(tools/winebuild,[install-dev]) -WINE_CONFIG_TOOL(tools/winedump,[install-dev]) -WINE_CONFIG_TOOL(tools/winegcc,[install-dev]) -WINE_CONFIG_TOOL(tools/wmc,[install-dev]) -WINE_CONFIG_TOOL(tools/wrc,[install-dev]) +WINE_CONFIG_MAKEFILE([server],,[install-lib,manpage]) +WINE_CONFIG_TOOL(tools,[install-dev,install-lib,manpage]) +WINE_CONFIG_TOOL(tools/widl,[install-dev,manpage]) +WINE_CONFIG_TOOL(tools/winebuild,[install-dev,manpage]) +WINE_CONFIG_TOOL(tools/winedump,[install-dev,manpage]) +WINE_CONFIG_TOOL(tools/winegcc,[install-dev,manpage]) +WINE_CONFIG_TOOL(tools/wmc,[install-dev,manpage]) +WINE_CONFIG_TOOL(tools/wrc,[install-dev,manpage]) AC_SUBST([LINGUAS],["\ ar \ diff --git a/tools/make_makefiles b/tools/make_makefiles index 6d7cd36bd38..487407d3667 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -310,11 +310,12 @@ sub parse_makefile($) $make{"=rules"} = $makerules{$var}; next; } - if (/^\s*(MODULE|IMPORTLIB|TESTDLL)\s*=\s*(.*)/) + if (/^\s*(MODULE|IMPORTLIB|TESTDLL|MANPAGE)\s*=\s*(.*)/) { my $var = $1; $make{$var} = $2; push @{$make{"=flags"}}, "implib" if $var eq "IMPORTLIB"; + push @{$make{"=flags"}}, "manpage" if $var eq "MANPAGE"; next; } if (/^\s*(BISON_SRCS|LEX_SRCS|IDL_[CHIPRS]_SRCS|IDL_TLB_SRCS|IMPLIB_SRCS|C_SRCS|MC_SRCS|RC_SRCS|PO_SRCS|SVG_SRCS|PROGRAMS)\s*=\s*(.*)/)