From 15ccabc9a86a771ec79627c3c844be78916aafe0 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Sun, 5 Dec 2010 16:17:42 +0100 Subject: [PATCH] makefiles: Add common rules for installing the main man page. --- .gitignore | 27 +-------------------------- Make.rules.in | 15 +++++++++++++++ loader/Makefile.in | 13 +++++-------- programs/msiexec/Makefile.in | 12 +----------- programs/notepad/Makefile.in | 12 +----------- programs/regedit/Makefile.in | 12 +----------- programs/regsvr32/Makefile.in | 12 +----------- programs/wineboot/Makefile.in | 12 +----------- programs/winecfg/Makefile.in | 12 +----------- programs/wineconsole/Makefile.in | 12 +----------- programs/winedbg/Makefile.in | 12 +----------- programs/winefile/Makefile.in | 12 +----------- programs/winemine/Makefile.in | 12 +----------- programs/winepath/Makefile.in | 12 +----------- server/Makefile.in | 13 ++++++++----- tools/Makefile.in | 13 +++++++------ tools/make_makefiles | 7 ++----- tools/widl/Makefile.in | 9 ++++----- tools/winebuild/Makefile.in | 9 ++++----- tools/winedump/Makefile.in | 9 ++++----- tools/winegcc/Makefile.in | 12 +++++------- tools/wmc/Makefile.in | 9 ++++----- tools/wrc/Makefile.in | 9 ++++----- 23 files changed, 74 insertions(+), 203 deletions(-) diff --git a/.gitignore b/.gitignore index c2b88f73226..dd74759a436 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ # Automatically generated by make_makefiles; DO NOT EDIT!! *.[oa] *.fake +*.man *.ok *.res *.so @@ -255,31 +256,17 @@ libs/wpp/ppy.tab.h loader/wine loader/wine-installed loader/wine-preloader -loader/wine.de.man -loader/wine.fr.man -loader/wine.man loader/wine64 programs/Makeprog.rules -programs/msiexec/msiexec.man -programs/notepad/notepad.man -programs/regedit/regedit.man -programs/regsvr32/regsvr32.man programs/rpcss/epm.h programs/rpcss/epm_s.c programs/rpcss/irot.h programs/rpcss/irot_s.c programs/services/svcctl.h programs/services/svcctl_s.c -programs/wineboot/wineboot.man -programs/winecfg/winecfg.man -programs/wineconsole/wineconsole.man programs/winedbg/dbg.tab.c programs/winedbg/dbg.tab.h programs/winedbg/debug.yy.c -programs/winedbg/winedbg.man -programs/winefile/winefile.man -programs/winemine/winemine.man -programs/winepath/winepath.man programs/winetest/*_test.exe programs/winetest/*_test.rc programs/winetest/build.nfo @@ -289,9 +276,6 @@ programs/wscript/ihost.h programs/wscript/ihost.tlb server/wineserver server/wineserver-installed -server/wineserver.de.man -server/wineserver.fr.man -server/wineserver.man tools/fnt2bdf tools/fnt2fon tools/make_ctests @@ -302,28 +286,19 @@ tools/widl/parser.tab.c tools/widl/parser.tab.h tools/widl/parser.yy.c tools/widl/widl -tools/widl/widl.man tools/wine.inf tools/wineapploader tools/winebuild/winebuild -tools/winebuild/winebuild.man tools/winedump/winedump -tools/winedump/winedump.man tools/winegcc/winecpp tools/winegcc/wineg++ tools/winegcc/winegcc -tools/winegcc/winegcc.man -tools/winemaker.de.man -tools/winemaker.fr.man -tools/winemaker.man tools/wmc/mcy.tab.c tools/wmc/mcy.tab.h tools/wmc/wmc tools/wmc/wmc-installed -tools/wmc/wmc.man tools/wrc/parser.tab.c tools/wrc/parser.tab.h tools/wrc/parser.yy.c tools/wrc/wrc tools/wrc/wrc-installed -tools/wrc/wrc.man diff --git a/Make.rules.in b/Make.rules.in index 30f6bf5098c..248070f785b 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -140,6 +140,21 @@ depend: dummy .PHONY: depend +# Rules for man pages + +MANPAGES = $(MANPAGE) $(EXTRA_MANPAGES) + +all: $(MANPAGES) + +install-man-pages:: $(MANPAGE) $(DESTDIR)$(mandir)/man$(prog_manext) + $(INSTALL_DATA) $(MANPAGE) $(DESTDIR)$(mandir)/man$(prog_manext)/$(MANPAGE:.man=).$(prog_manext) + +uninstall-man-pages:: + $(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/$(MANPAGE:.man=).$(prog_manext) + +install:: @WOW64_DISABLE@ $(MANPAGE:%=install-man-pages) +uninstall:: @WOW64_DISABLE@ $(MANPAGE:%=uninstall-man-pages) + # Rules for cleaning $(EXTRASUBDIRS:%=%/__clean__): dummy diff --git a/loader/Makefile.in b/loader/Makefile.in index 001728b8957..0ededde796b 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -13,8 +13,9 @@ PROGRAMS = \ wine-installed \ wine-preloader -MANPAGES = \ - wine.man \ +MANPAGE = wine.man + +EXTRA_MANPAGES = \ wine.de.man \ wine.fr.man @@ -24,7 +25,7 @@ INSTALLDIRS = \ $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext) \ $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext) -all: $(MAIN_BINARY) wine-installed $(EXTRA_BINARIES) $(MANPAGES) +all: $(MAIN_BINARY) wine-installed $(EXTRA_BINARIES) @MAKE_RULES@ @@ -48,15 +49,11 @@ $(EXTRA_BINARIES:%=__install__%): $(EXTRA_BINARIES) $(DESTDIR)$(bindir) dummy install install-lib:: wine-installed $(DESTDIR)$(bindir) $(EXTRA_BINARIES:%=__install__%) $(INSTALL_PROGRAM) wine-installed $(DESTDIR)$(bindir)/$(MAIN_BINARY) -@WOW64_DISABLE@ install install-lib:: install-man-pages - -install-man-pages: $(MANPAGES) $(INSTALLDIRS) dummy - $(INSTALL_DATA) wine.man $(DESTDIR)$(mandir)/man$(prog_manext)/wine.$(prog_manext) +install-man-pages:: $(EXTRA_MANPAGES) $(INSTALLDIRS) dummy $(INSTALL_DATA) wine.de.man $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/wine.$(prog_manext) $(INSTALL_DATA) wine.fr.man $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/wine.$(prog_manext) uninstall:: -cd $(DESTDIR)$(bindir) && $(RM) $(MAIN_BINARY) $(EXTRA_BINARIES) - $(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/wine.$(prog_manext) $(RM) $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/wine.$(prog_manext) $(RM) $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/wine.$(prog_manext) diff --git a/programs/msiexec/Makefile.in b/programs/msiexec/Makefile.in index 63026b6b367..9dd6562f159 100644 --- a/programs/msiexec/Makefile.in +++ b/programs/msiexec/Makefile.in @@ -9,18 +9,8 @@ C_SRCS = \ RC_SRCS = rsrc.rc -MANPAGES = msiexec.man +MANPAGE = msiexec.man SVG_SRCS = msiexec.svg @MAKE_PROG_RULES@ - -all: $(MANPAGES) - -install-man-pages:: $(MANPAGES) $(DESTDIR)$(mandir)/man$(prog_manext) - $(INSTALL_DATA) msiexec.man $(DESTDIR)$(mandir)/man$(prog_manext)/msiexec.$(prog_manext) - -@WOW64_DISABLE@ install install-lib:: install-man-pages - -uninstall:: - $(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/msiexec.$(prog_manext) diff --git a/programs/notepad/Makefile.in b/programs/notepad/Makefile.in index f79cf706766..0ce1a553d45 100644 --- a/programs/notepad/Makefile.in +++ b/programs/notepad/Makefile.in @@ -43,18 +43,8 @@ RC_SRCS = \ Zh.rc \ rsrc.rc -MANPAGES = notepad.man +MANPAGE = notepad.man SVG_SRCS = notepad.svg @MAKE_PROG_RULES@ - -all: $(MANPAGES) - -install-man-pages:: $(MANPAGES) $(DESTDIR)$(mandir)/man$(prog_manext) - $(INSTALL_DATA) notepad.man $(DESTDIR)$(mandir)/man$(prog_manext)/notepad.$(prog_manext) - -@WOW64_DISABLE@ install install-lib:: install-man-pages - -uninstall:: - $(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/notepad.$(prog_manext) diff --git a/programs/regedit/Makefile.in b/programs/regedit/Makefile.in index 360575dd8f0..9c6dd4c6e74 100644 --- a/programs/regedit/Makefile.in +++ b/programs/regedit/Makefile.in @@ -45,18 +45,8 @@ RC_SRCS = \ Zh.rc \ rsrc.rc -MANPAGES = regedit.man +MANPAGE = regedit.man SVG_SRCS = regedit.svg @MAKE_PROG_RULES@ - -all: $(MANPAGES) - -install-man-pages:: $(MANPAGES) $(DESTDIR)$(mandir)/man$(prog_manext) - $(INSTALL_DATA) regedit.man $(DESTDIR)$(mandir)/man$(prog_manext)/regedit.$(prog_manext) - -@WOW64_DISABLE@ install install-lib:: install-man-pages - -uninstall:: - $(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/regedit.$(prog_manext) diff --git a/programs/regsvr32/Makefile.in b/programs/regsvr32/Makefile.in index 37e7850c2e1..e06ef0b2f2f 100644 --- a/programs/regsvr32/Makefile.in +++ b/programs/regsvr32/Makefile.in @@ -8,16 +8,6 @@ C_SRCS = \ RC_SRCS = regsvr32.rc -MANPAGES = regsvr32.man +MANPAGE = regsvr32.man @MAKE_PROG_RULES@ - -all: $(MANPAGES) - -install-man-pages:: $(MANPAGES) $(DESTDIR)$(mandir)/man$(prog_manext) - $(INSTALL_DATA) regsvr32.man $(DESTDIR)$(mandir)/man$(prog_manext)/regsvr32.$(prog_manext) - -@WOW64_DISABLE@ install install-lib:: install-man-pages - -uninstall:: - $(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/regsvr32.$(prog_manext) diff --git a/programs/wineboot/Makefile.in b/programs/wineboot/Makefile.in index bd8632b2f11..480e21c59b9 100644 --- a/programs/wineboot/Makefile.in +++ b/programs/wineboot/Makefile.in @@ -31,16 +31,6 @@ RC_SRCS = \ wineboot_Uk.rc \ wineboot_Zh.rc -MANPAGES = wineboot.man +MANPAGE = wineboot.man @MAKE_PROG_RULES@ - -all: $(MANPAGES) - -install-man-pages:: $(MANPAGES) $(DESTDIR)$(mandir)/man$(prog_manext) - $(INSTALL_DATA) wineboot.man $(DESTDIR)$(mandir)/man$(prog_manext)/wineboot.$(prog_manext) - -@WOW64_DISABLE@ install install-lib:: install-man-pages - -uninstall:: - $(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/wineboot.$(prog_manext) diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in index 0185196f39a..bc956e7311d 100644 --- a/programs/winecfg/Makefile.in +++ b/programs/winecfg/Makefile.in @@ -43,20 +43,10 @@ RC_SRCS = \ Zh.rc \ winecfg.rc -MANPAGES = winecfg.man +MANPAGE = winecfg.man SVG_SRCS = \ logo.svg \ winecfg.svg @MAKE_PROG_RULES@ - -all: $(MANPAGES) - -install-man-pages:: $(MANPAGES) $(DESTDIR)$(mandir)/man$(prog_manext) - $(INSTALL_DATA) winecfg.man $(DESTDIR)$(mandir)/man$(prog_manext)/winecfg.$(prog_manext) - -@WOW64_DISABLE@ install install-lib:: install-man-pages - -uninstall:: - $(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/winecfg.$(prog_manext) diff --git a/programs/wineconsole/Makefile.in b/programs/wineconsole/Makefile.in index 8238cc0f2ca..9518bfa782c 100644 --- a/programs/wineconsole/Makefile.in +++ b/programs/wineconsole/Makefile.in @@ -36,16 +36,6 @@ RC_SRCS = \ wineconsole_Uk.rc \ wineconsole_Zh.rc -MANPAGES = wineconsole.man +MANPAGE = wineconsole.man @MAKE_PROG_RULES@ - -all: $(MANPAGES) - -install-man-pages:: $(MANPAGES) $(DESTDIR)$(mandir)/man$(prog_manext) - $(INSTALL_DATA) wineconsole.man $(DESTDIR)$(mandir)/man$(prog_manext)/wineconsole.$(prog_manext) - -@WOW64_DISABLE@ install install-lib:: install-man-pages - -uninstall:: - $(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/wineconsole.$(prog_manext) diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in index a80591f9bdb..409c701517e 100644 --- a/programs/winedbg/Makefile.in +++ b/programs/winedbg/Makefile.in @@ -54,16 +54,6 @@ RC_SRCS = \ LEX_SRCS = debug.l BISON_SRCS = dbg.y -MANPAGES = winedbg.man +MANPAGE = winedbg.man @MAKE_PROG_RULES@ - -all: $(MANPAGES) - -install-man-pages:: $(MANPAGES) $(DESTDIR)$(mandir)/man$(prog_manext) - $(INSTALL_DATA) winedbg.man $(DESTDIR)$(mandir)/man$(prog_manext)/winedbg.$(prog_manext) - -@WOW64_DISABLE@ install install-lib:: install-man-pages - -uninstall:: - $(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/winedbg.$(prog_manext) diff --git a/programs/winefile/Makefile.in b/programs/winefile/Makefile.in index 3d5b47bbe5b..c32c19bc554 100644 --- a/programs/winefile/Makefile.in +++ b/programs/winefile/Makefile.in @@ -33,18 +33,8 @@ RC_SRCS = \ Zh.rc \ rsrc.rc -MANPAGES = winefile.man +MANPAGE = winefile.man SVG_SRCS = winefile.svg @MAKE_PROG_RULES@ - -all: $(MANPAGES) - -install-man-pages:: $(MANPAGES) $(DESTDIR)$(mandir)/man$(prog_manext) - $(INSTALL_DATA) winefile.man $(DESTDIR)$(mandir)/man$(prog_manext)/winefile.$(prog_manext) - -@WOW64_DISABLE@ install install-lib:: install-man-pages - -uninstall:: - $(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/winefile.$(prog_manext) diff --git a/programs/winemine/Makefile.in b/programs/winemine/Makefile.in index 33e9a194110..539db69060b 100644 --- a/programs/winemine/Makefile.in +++ b/programs/winemine/Makefile.in @@ -33,18 +33,8 @@ RC_SRCS = \ Zh.rc \ rsrc.rc -MANPAGES = winemine.man +MANPAGE = winemine.man SVG_SRCS = winemine.svg @MAKE_PROG_RULES@ - -all: $(MANPAGES) - -install-man-pages:: $(MANPAGES) $(DESTDIR)$(mandir)/man$(prog_manext) - $(INSTALL_DATA) winemine.man $(DESTDIR)$(mandir)/man$(prog_manext)/winemine.$(prog_manext) - -@WOW64_DISABLE@ install install-lib:: install-man-pages - -uninstall:: - $(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/winemine.$(prog_manext) diff --git a/programs/winepath/Makefile.in b/programs/winepath/Makefile.in index dd3d0134cbe..4ecd9f1bfc2 100644 --- a/programs/winepath/Makefile.in +++ b/programs/winepath/Makefile.in @@ -4,16 +4,6 @@ APPMODE = -mconsole -municode C_SRCS = winepath.c -MANPAGES = winepath.man +MANPAGE = winepath.man @MAKE_PROG_RULES@ - -all: $(MANPAGES) - -install-man-pages:: $(MANPAGES) $(DESTDIR)$(mandir)/man$(prog_manext) - $(INSTALL_DATA) winepath.man $(DESTDIR)$(mandir)/man$(prog_manext)/winepath.$(prog_manext) - -@WOW64_DISABLE@ install install-lib:: install-man-pages - -uninstall:: - $(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/winepath.$(prog_manext) diff --git a/server/Makefile.in b/server/Makefile.in index b9a0804181f..a2f1a52a060 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -47,7 +47,9 @@ C_SRCS = \ winstation.c PROGRAMS = wineserver wineserver-installed -MANPAGES = wineserver.man wineserver.de.man wineserver.fr.man + +MANPAGE = wineserver.man +EXTRA_MANPAGES = wineserver.de.man wineserver.fr.man INSTALLDIRS = \ $(DESTDIR)$(bindir) \ @@ -55,7 +57,7 @@ INSTALLDIRS = \ $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext) \ $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext) -all: $(PROGRAMS) $(MANPAGES) +all: $(PROGRAMS) @MAKE_RULES@ @@ -65,13 +67,14 @@ wineserver: $(OBJS) wineserver-installed: $(OBJS) $(CC) -o $@ $(OBJS) $(LIBWINE) $(LIBPORT) $(LDFLAGS) $(LIBS) $(LDRPATH_INSTALL) -install install-lib:: wineserver-installed $(MANPAGES) $(INSTALLDIRS) +install install-lib:: wineserver-installed $(DESTDIR)$(bindir) install-man-pages $(INSTALL_PROGRAM) wineserver-installed $(DESTDIR)$(bindir)/wineserver - $(INSTALL_DATA) wineserver.man $(DESTDIR)$(mandir)/man$(prog_manext)/wineserver.$(prog_manext) + +install-man-pages:: $(EXTRA_MANPAGES) $(INSTALLDIRS) $(INSTALL_DATA) wineserver.de.man $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/wineserver.$(prog_manext) $(INSTALL_DATA) wineserver.fr.man $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/wineserver.$(prog_manext) uninstall:: - $(RM) $(DESTDIR)$(bindir)/wineserver $(DESTDIR)$(mandir)/man$(prog_manext)/wineserver.$(prog_manext) + $(RM) $(DESTDIR)$(bindir)/wineserver $(RM) $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/wineserver.$(prog_manext) $(RM) $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/wineserver.$(prog_manext) diff --git a/tools/Makefile.in b/tools/Makefile.in index c00dfaf4d6a..4c8b238f984 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -11,8 +11,9 @@ PROGRAMS = \ wine.inf \ wineapploader -MANPAGES = \ - winemaker.man \ +MANPAGE = winemaker.man + +EXTRA_MANPAGES = \ winemaker.de.man \ winemaker.fr.man @@ -36,7 +37,7 @@ INSTALLDIRS = \ UPDATE_DESKTOP_DATABASE = update-desktop-database -all: makedep$(EXEEXT) $(PROGRAMS) $(MANPAGES) +all: makedep$(EXEEXT) $(PROGRAMS) @MAKE_RULES@ @@ -70,9 +71,10 @@ install install-lib:: wine.inf $(INSTALLDIRS) $(INSTALL_DATA) $(srcdir)/wine.desktop $(DESTDIR)$(datadir)/applications/wine.desktop -$(UPDATE_DESKTOP_DATABASE) -install install-dev:: $(INSTALLDIRS) +install install-dev:: $(DESTDIR)$(bindir) install-man-pages $(INSTALL_SCRIPT) $(srcdir)/winemaker $(DESTDIR)$(bindir)/winemaker - $(INSTALL_DATA) winemaker.man $(DESTDIR)$(mandir)/man$(prog_manext)/winemaker.$(prog_manext) + +install-man-pages:: $(EXTRA_MANPAGES) $(INSTALLDIRS) $(INSTALL_DATA) winemaker.de.man $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/winemaker.$(prog_manext) $(INSTALL_DATA) winemaker.fr.man $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/winemaker.$(prog_manext) @@ -81,7 +83,6 @@ uninstall:: $(DESTDIR)$(datadir)/wine/l_intl.nls \ $(DESTDIR)$(datadir)/applications/wine.desktop \ $(DESTDIR)$(bindir)/winemaker \ - $(DESTDIR)$(mandir)/man$(prog_manext)/winemaker.$(prog_manext) \ $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/winemaker.$(prog_manext) \ $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/winemaker.$(prog_manext) -$(UPDATE_DESKTOP_DATABASE) diff --git a/tools/make_makefiles b/tools/make_makefiles index 39441def7ec..29cb8d64720 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -76,6 +76,7 @@ my %modules16 = my @ignores = ( "*.[oa]", "*.fake", + "*.man", "*.ok", "*.res", "*.so", @@ -304,7 +305,7 @@ sub parse_makefile($) $make{$1} = $2; next; } - if (/^\s*(BISON_SRCS|LEX_SRCS|IDL_[CHIPRS]_SRCS|IDL_TLB_SRCS|IMPLIB_SRCS|C_SRCS|MC_SRCS|RC_SRCS|SVG_SRCS|MANPAGES|PROGRAMS)\s*=\s*(.*)/) + if (/^\s*(BISON_SRCS|LEX_SRCS|IDL_[CHIPRS]_SRCS|IDL_TLB_SRCS|IMPLIB_SRCS|C_SRCS|MC_SRCS|RC_SRCS|SVG_SRCS|PROGRAMS)\s*=\s*(.*)/) { my @list = split(/\s+/, $2); $make{$1} = \@list; @@ -533,10 +534,6 @@ sub update_gitignore(@) { my %makefile = %{$makefiles{$make}}; my $dir = $makefile{"=dir"}; - if (defined $makefile{"MANPAGES"}) - { - push @ignores, map { $dir . $_; } @{$makefile{"MANPAGES"}}; - } if (defined $makefile{"PROGRAMS"}) { push @ignores, map { s/\$\(EXEEXT\)//; $dir . $_; } @{$makefile{"PROGRAMS"}}; diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in index 3fc98fe3940..72cb1c0a3b2 100644 --- a/tools/widl/Makefile.in +++ b/tools/widl/Makefile.in @@ -1,7 +1,7 @@ DEFS = -D__WINESRC__ $(EXTRADEFS) PROGRAMS = widl$(EXEEXT) -MANPAGES = widl.man +MANPAGE = widl.man C_SRCS = \ client.c \ @@ -23,16 +23,15 @@ BISON_SRCS = parser.y INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext) -all: $(PROGRAMS) $(MANPAGES) +all: $(PROGRAMS) @MAKE_RULES@ widl$(EXEEXT): $(OBJS) $(LIBWPP) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBWPP) $(LIBPORT) $(LDFLAGS) -install install-dev:: $(PROGRAMS) $(MANPAGES) $(INSTALLDIRS) +install:: $(PROGRAMS) $(DESTDIR)$(bindir) $(INSTALL_PROGRAM) widl$(EXEEXT) $(DESTDIR)$(bindir)/widl$(EXEEXT) - $(INSTALL_DATA) widl.man $(DESTDIR)$(mandir)/man$(prog_manext)/widl.$(prog_manext) uninstall:: - $(RM) $(DESTDIR)$(bindir)/widl$(EXEEXT) $(DESTDIR)$(mandir)/man$(prog_manext)/widl.$(prog_manext) + $(RM) $(DESTDIR)$(bindir)/widl$(EXEEXT) diff --git a/tools/winebuild/Makefile.in b/tools/winebuild/Makefile.in index 5bf2df1ad88..d10ede56308 100644 --- a/tools/winebuild/Makefile.in +++ b/tools/winebuild/Makefile.in @@ -1,7 +1,7 @@ DEFS = -D__WINESRC__ $(EXTRADEFS) PROGRAMS = winebuild$(EXEEXT) -MANPAGES = winebuild.man +MANPAGE = winebuild.man C_SRCS = \ import.c \ @@ -16,16 +16,15 @@ C_SRCS = \ INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext) -all: $(PROGRAMS) $(MANPAGES) +all: $(PROGRAMS) @MAKE_RULES@ winebuild$(EXEEXT): $(OBJS) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBPORT) $(LDFLAGS) -install install-dev:: $(PROGRAMS) $(MANPAGES) $(INSTALLDIRS) +install:: $(PROGRAMS) $(DESTDIR)$(bindir) $(INSTALL_PROGRAM) winebuild$(EXEEXT) $(DESTDIR)$(bindir)/winebuild$(EXEEXT) - $(INSTALL_DATA) winebuild.man $(DESTDIR)$(mandir)/man$(prog_manext)/winebuild.$(prog_manext) uninstall:: - $(RM) $(DESTDIR)$(bindir)/winebuild$(EXEEXT) $(DESTDIR)$(mandir)/man$(prog_manext)/winebuild.$(prog_manext) + $(RM) $(DESTDIR)$(bindir)/winebuild$(EXEEXT) diff --git a/tools/winedump/Makefile.in b/tools/winedump/Makefile.in index ecc4da71979..d4210c1e162 100644 --- a/tools/winedump/Makefile.in +++ b/tools/winedump/Makefile.in @@ -1,7 +1,7 @@ DEFS = -D__WINESRC__ $(EXTRADEFS) PROGRAMS = winedump$(EXEEXT) -MANPAGES = winedump.man +MANPAGE = winedump.man C_SRCS = \ debug.c \ @@ -26,17 +26,16 @@ C_SRCS = \ INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext) -all: $(PROGRAMS) $(MANPAGES) +all: $(PROGRAMS) @MAKE_RULES@ winedump$(EXEEXT): $(OBJS) $(CC) $(CFLAGS) -o winedump$(EXEEXT) $(OBJS) $(LIBPORT) $(LDFLAGS) -install install-dev:: $(PROGRAMS) $(MANPAGES) $(INSTALLDIRS) +install:: $(PROGRAMS) $(DESTDIR)$(bindir) $(INSTALL_PROGRAM) winedump$(EXEEXT) $(DESTDIR)$(bindir)/winedump$(EXEEXT) - $(INSTALL_DATA) winedump.man $(DESTDIR)$(mandir)/man$(prog_manext)/winedump.$(prog_manext) $(INSTALL_SCRIPT) $(srcdir)/function_grep.pl $(DESTDIR)$(bindir)/function_grep.pl uninstall:: - $(RM) $(DESTDIR)$(bindir)/function_grep.pl $(DESTDIR)$(bindir)/winedump$(EXEEXT) $(DESTDIR)$(mandir)/man$(prog_manext)/winedump.$(prog_manext) + $(RM) $(DESTDIR)$(bindir)/function_grep.pl $(DESTDIR)$(bindir)/winedump$(EXEEXT) diff --git a/tools/winegcc/Makefile.in b/tools/winegcc/Makefile.in index 2a31a17a184..db869fb5d13 100644 --- a/tools/winegcc/Makefile.in +++ b/tools/winegcc/Makefile.in @@ -14,7 +14,7 @@ PROGRAMS = \ winegcc$(EXEEXT) \ wineg++$(EXEEXT) -MANPAGES = winegcc.man +MANPAGE = winegcc.man C_SRCS = \ utils.c \ @@ -22,7 +22,7 @@ C_SRCS = \ INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext) -all: $(PROGRAMS) $(MANPAGES) +all: $(PROGRAMS) @MAKE_RULES@ @@ -32,15 +32,13 @@ winegcc$(EXEEXT): winegcc.o utils.o winecpp$(EXEEXT) wineg++$(EXEEXT): winegcc$(EXEEXT) $(RM) $@ && $(LN_S) winegcc$(EXEEXT) $@ -install install-dev:: $(PROGRAMS) $(MANPAGES) $(INSTALLDIRS) +install:: $(PROGRAMS) $(DESTDIR)$(bindir) install-man-pages $(INSTALL_PROGRAM) winegcc$(EXEEXT) $(DESTDIR)$(bindir)/winegcc$(EXEEXT) cd $(DESTDIR)$(bindir) && $(RM) wineg++$(EXEEXT) && $(LN_S) winegcc$(EXEEXT) wineg++$(EXEEXT) cd $(DESTDIR)$(bindir) && $(RM) winecpp$(EXEEXT) && $(LN_S) winegcc$(EXEEXT) winecpp$(EXEEXT) - $(INSTALL_DATA) winegcc.man $(DESTDIR)$(mandir)/man$(prog_manext)/winegcc.$(prog_manext) cd $(DESTDIR)$(mandir)/man$(prog_manext) && $(RM) wineg++.$(prog_manext) && $(LN_S) winegcc.$(prog_manext) wineg++.$(prog_manext) cd $(DESTDIR)$(mandir)/man$(prog_manext) && $(RM) winecpp.$(prog_manext) && $(LN_S) winegcc.$(prog_manext) winecpp.$(prog_manext) uninstall:: - $(RM) $(DESTDIR)$(bindir)/winegcc$(EXEEXT) $(DESTDIR)$(bindir)/wineg++$(EXEEXT) $(DESTDIR)$(bindir)/winecpp$(EXEEXT) \ - $(DESTDIR)$(mandir)/man$(prog_manext)/winegcc.$(prog_manext) $(DESTDIR)$(mandir)/man$(prog_manext)/wineg++.$(prog_manext) \ - $(DESTDIR)$(mandir)/man$(prog_manext)/winecpp.$(prog_manext) + $(RM) $(DESTDIR)$(bindir)/winegcc$(EXEEXT) $(DESTDIR)$(bindir)/wineg++$(EXEEXT) $(DESTDIR)$(bindir)/winecpp$(EXEEXT) + $(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/wineg++.$(prog_manext) $(DESTDIR)$(mandir)/man$(prog_manext)/winecpp.$(prog_manext) diff --git a/tools/wmc/Makefile.in b/tools/wmc/Makefile.in index f58bd38ce95..27662b3e66e 100644 --- a/tools/wmc/Makefile.in +++ b/tools/wmc/Makefile.in @@ -1,7 +1,7 @@ DEFS = -D__WINESRC__ $(EXTRADEFS) PROGRAMS = wmc$(EXEEXT) wmc-installed -MANPAGES = wmc.man +MANPAGE = wmc.man C_SRCS = \ lang.c \ @@ -14,7 +14,7 @@ BISON_SRCS = mcy.y INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext) -all: $(PROGRAMS) $(MANPAGES) +all: $(PROGRAMS) @MAKE_RULES@ @@ -24,9 +24,8 @@ wmc$(EXEEXT): $(OBJS) wmc-installed: $(OBJS) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBWINE) $(LIBPORT) $(LDFLAGS) $(LDRPATH_INSTALL) -install install-dev:: wmc-installed $(MANPAGES) $(INSTALLDIRS) - $(INSTALL_DATA) wmc.man $(DESTDIR)$(mandir)/man$(prog_manext)/wmc.$(prog_manext) +install:: wmc-installed $(DESTDIR)$(bindir) $(INSTALL_PROGRAM) wmc-installed $(DESTDIR)$(bindir)/wmc$(EXEEXT) uninstall:: - $(RM) $(DESTDIR)$(bindir)/wmc$(EXEEXT) $(DESTDIR)$(mandir)/man$(prog_manext)/wmc.$(prog_manext) + $(RM) $(DESTDIR)$(bindir)/wmc$(EXEEXT) diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in index b2ce451b6f7..9e9544d19cc 100644 --- a/tools/wrc/Makefile.in +++ b/tools/wrc/Makefile.in @@ -1,6 +1,6 @@ DEFS = -D__WINESRC__ -DINCLUDEDIR="\"$(includedir)\"" $(EXTRADEFS) PROGRAMS = wrc$(EXEEXT) wrc-installed -MANPAGES = wrc.man +MANPAGE = wrc.man C_SRCS = \ dumpres.c \ @@ -17,7 +17,7 @@ BISON_SRCS = parser.y INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext) -all: $(PROGRAMS) $(MANPAGES) +all: $(PROGRAMS) @MAKE_RULES@ @@ -27,9 +27,8 @@ wrc$(EXEEXT): $(OBJS) $(LIBWPP) wrc-installed: $(OBJS) $(LIBWPP) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBWPP) $(LIBWINE) $(LIBPORT) $(LDFLAGS) $(LDRPATH_INSTALL) -install install-dev:: wrc-installed $(MANPAGES) $(INSTALLDIRS) - $(INSTALL_DATA) wrc.man $(DESTDIR)$(mandir)/man$(prog_manext)/wrc.$(prog_manext) +install:: wrc-installed $(DESTDIR)$(bindir) $(INSTALL_PROGRAM) wrc-installed $(DESTDIR)$(bindir)/wrc$(EXEEXT) uninstall:: - $(RM) $(DESTDIR)$(bindir)/wrc$(EXEEXT) $(DESTDIR)$(mandir)/man$(prog_manext)/wrc.$(prog_manext) + $(RM) $(DESTDIR)$(bindir)/wrc$(EXEEXT)