diff --git a/documentation/.cvsignore b/documentation/.cvsignore index e66451a343f..f3c7a7c5da6 100644 --- a/documentation/.cvsignore +++ b/documentation/.cvsignore @@ -1,2 +1 @@ Makefile -wine.man diff --git a/documentation/Makefile.in b/documentation/Makefile.in index e095e25c939..3df282c3a18 100644 --- a/documentation/Makefile.in +++ b/documentation/Makefile.in @@ -6,28 +6,13 @@ MODULE = none EXTRASUBDIRS = samples -MAN_TARGETS = wine.man - -all: $(MAN_TARGETS) - @MAKE_RULES@ -wine.man: wine.man.in - sed -e 's,@bindir\@,$(bindir),g' -e 's,@dlldir\@,$(dlldir),g' -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' $(SRCDIR)/wine.man.in >$@ || ($(RM) $@ && false) - -install:: $(MAN_TARGETS) - $(MKINSTALLDIRS) $(mandir)/man$(prog_manext) - $(INSTALL_DATA) wine.man $(mandir)/man$(prog_manext)/wine.$(prog_manext) - -uninstall:: - $(RM) $(mandir)/man$(prog_manext)/wine.$(prog_manext) - install-api-man:: $(MKINSTALLDIRS) $(mandir)/man$(api_manext) for i in man$(api_manext)/*; do $(INSTALL_DATA) $$i $(mandir)/man$(api_manext); done clean:: - $(RM) $(MAN_TARGETS) $(RM) -r html api-guide man$(api_manext) ### Dependencies: diff --git a/loader/.cvsignore b/loader/.cvsignore index cc4ff2181e2..fb57129a0bf 100644 --- a/loader/.cvsignore +++ b/loader/.cvsignore @@ -4,3 +4,4 @@ wine-glibc wine-kthread wine-preloader wine-pthread +wine.man diff --git a/loader/Makefile.in b/loader/Makefile.in index f07a2dab7af..4036f224611 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -17,7 +17,9 @@ PTHREAD_OBJS = pthread.o main.o WINE_BINARIES = @WINE_BINARIES@ MAIN_BINARY = @MAIN_BINARY@ -all: $(WINE_BINARIES) $(MODULE) +MAN_TARGETS = wine.man + +all: $(WINE_BINARIES) $(MODULE) $(MAN_TARGETS) @MAKE_RULES@ @@ -39,19 +41,24 @@ wine-pthread: $(PTHREAD_OBJS) Makefile.in $(MODULE): $(MAIN_BINARY) $(RM) $(MODULE) && $(LN_S) $(MAIN_BINARY) $(MODULE) -install:: $(WINE_BINARIES) - $(MKINSTALLDIRS) $(bindir) +wine.man: wine.man.in + sed -e 's,@bindir\@,$(bindir),g' -e 's,@dlldir\@,$(dlldir),g' -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' $(SRCDIR)/wine.man.in >$@ || ($(RM) $@ && false) + +install:: $(WINE_BINARIES) $(MAN_TARGETS) + $(MKINSTALLDIRS) $(bindir) $(mandir)/man$(prog_manext) for f in $(WINE_BINARIES); do \ if [ "$(MAIN_BINARY)" = "$$f" ]; \ then $(INSTALL_PROGRAM) $$f $(bindir)/$(MODULE); \ else $(INSTALL_PROGRAM) $$f $(bindir)/$$f; \ fi; \ done + $(INSTALL_DATA) wine.man $(mandir)/man$(prog_manext)/wine.$(prog_manext) uninstall:: -cd $(bindir) && $(RM) $(WINE_BINARIES) $(MODULE) + $(RM) $(mandir)/man$(prog_manext)/wine.$(prog_manext) clean:: - $(RM) $(WINE_BINARIES) $(MODULE) + $(RM) $(WINE_BINARIES) $(MODULE) $(MAN_TARGETS) ### Dependencies: diff --git a/documentation/wine.man.in b/loader/wine.man.in similarity index 100% rename from documentation/wine.man.in rename to loader/wine.man.in