Module: wine Branch: master Commit: 005565d90df24e28a4ae3baaed5f029aa3948ed6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=005565d90df24e28a4ae3baaed... Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 2 12:50:24 2013 +0200 makefiles: Make sure to install manpages for the install-lib and install-dev cases. --- Make.rules.in | 2 ++ loader/Makefile.in | 4 ++-- tools/widl/Makefile.in | 2 +- tools/winebuild/Makefile.in | 2 +- tools/winedump/Makefile.in | 2 +- tools/wmc/Makefile.in | 2 +- tools/wrc/Makefile.in | 2 +- 7 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 486a437..b7b89f5 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -166,6 +166,8 @@ uninstall-man-pages:: install:: @WOW64_DISABLE@ $(MANPAGE:.man=.man.in install-man-pages) uninstall:: @WOW64_DISABLE@ $(MANPAGE:.man=.man.in uninstall-man-pages) +.PHONY: install-man-pages uninstall-man-pages + # Rules for cleaning $(EXTRASUBDIRS:%=%/__clean__): dummy diff --git a/loader/Makefile.in b/loader/Makefile.in index 0cb80a8..a7ab893 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -51,9 +51,9 @@ wine_info.plist: wine_info.plist.in $(EXTRA_BINARIES:%=__install__%): $(EXTRA_BINARIES) $(DESTDIR)$(bindir) dummy f=`expr $@ : '__install__\(.*\)'` && $(INSTALL_PROGRAM) $$f $(DESTDIR)$(bindir)/$$f -.PHONY: install-man-pages $(EXTRA_BINARIES:%=__install__%) +.PHONY: $(EXTRA_BINARIES:%=__install__%) -install install-lib:: wine-installed $(DESTDIR)$(bindir) $(EXTRA_BINARIES:%=__install__%) +install install-lib:: wine-installed $(DESTDIR)$(bindir) $(EXTRA_BINARIES:%=__install__%) @WOW64_DISABLE@ install-man-pages $(INSTALL_PROGRAM) wine-installed $(DESTDIR)$(bindir)/$(MAIN_BINARY) install-man-pages:: $(EXTRA_MANPAGES) $(INSTALLDIRS) dummy diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in index 88558bb..4bbcf1e 100644 --- a/tools/widl/Makefile.in +++ b/tools/widl/Makefile.in @@ -31,7 +31,7 @@ all: $(PROGRAMS) widl$(EXEEXT): $(OBJS) $(LIBWPP) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBWPP) $(LIBPORT) $(LDFLAGS) -install install-dev:: $(PROGRAMS) $(DESTDIR)$(bindir) +install install-dev:: $(PROGRAMS) $(DESTDIR)$(bindir) install-man-pages $(INSTALL_PROGRAM) widl$(EXEEXT) $(DESTDIR)$(bindir)/widl$(EXEEXT) uninstall:: diff --git a/tools/winebuild/Makefile.in b/tools/winebuild/Makefile.in index 2017129..96bc4f9 100644 --- a/tools/winebuild/Makefile.in +++ b/tools/winebuild/Makefile.in @@ -23,7 +23,7 @@ all: $(PROGRAMS) winebuild$(EXEEXT): $(OBJS) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBPORT) $(LDFLAGS) -install install-dev:: $(PROGRAMS) $(DESTDIR)$(bindir) +install install-dev:: $(PROGRAMS) $(DESTDIR)$(bindir) install-man-pages $(INSTALL_PROGRAM) winebuild$(EXEEXT) $(DESTDIR)$(bindir)/winebuild$(EXEEXT) uninstall:: diff --git a/tools/winedump/Makefile.in b/tools/winedump/Makefile.in index e8e4323..ce61682 100644 --- a/tools/winedump/Makefile.in +++ b/tools/winedump/Makefile.in @@ -34,7 +34,7 @@ all: $(PROGRAMS) winedump$(EXEEXT): $(OBJS) $(CC) $(CFLAGS) -o winedump$(EXEEXT) $(OBJS) $(LIBPORT) $(LDFLAGS) -install install-dev:: $(PROGRAMS) $(DESTDIR)$(bindir) +install install-dev:: $(PROGRAMS) $(DESTDIR)$(bindir) install-man-pages $(INSTALL_PROGRAM) winedump$(EXEEXT) $(DESTDIR)$(bindir)/winedump$(EXEEXT) $(INSTALL_SCRIPT) $(srcdir)/function_grep.pl $(DESTDIR)$(bindir)/function_grep.pl diff --git a/tools/wmc/Makefile.in b/tools/wmc/Makefile.in index a3ba3dd..fc079f7 100644 --- a/tools/wmc/Makefile.in +++ b/tools/wmc/Makefile.in @@ -25,7 +25,7 @@ wmc$(EXEEXT): $(OBJS) wmc-installed: $(OBJS) $(CC) $(CFLAGS) -o $@ $(OBJS) $(ALL_LIBS) $(LDFLAGS) $(LDRPATH_INSTALL) -install install-dev:: wmc-installed $(DESTDIR)$(bindir) +install install-dev:: wmc-installed $(DESTDIR)$(bindir) install-man-pages $(INSTALL_PROGRAM) wmc-installed $(DESTDIR)$(bindir)/wmc$(EXEEXT) uninstall:: diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in index 5092adb..6347dc1 100644 --- a/tools/wrc/Makefile.in +++ b/tools/wrc/Makefile.in @@ -29,7 +29,7 @@ wrc$(EXEEXT): $(OBJS) $(LIBWPP) wrc-installed: $(OBJS) $(LIBWPP) $(CC) $(CFLAGS) -o $@ $(OBJS) $(ALL_LIBS) $(LDFLAGS) $(LDRPATH_INSTALL) -install install-dev:: wrc-installed $(DESTDIR)$(bindir) +install install-dev:: wrc-installed $(DESTDIR)$(bindir) install-man-pages $(INSTALL_PROGRAM) wrc-installed $(DESTDIR)$(bindir)/wrc$(EXEEXT) uninstall::