diff --git a/Makefile.in b/Makefile.in index 9aee218d4f2..57d5fbe3d1a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -42,7 +42,6 @@ SUBDIRS = \ # Sub-directories to install for install-lib INSTALLLIBSUBDIRS = \ - documentation \ $(FONTSSUBDIRS) \ loader \ programs \ @@ -141,17 +140,8 @@ TAGS etags: tags ctags: find $(TOPSRCDIR) -name '*.[ch]' -a -not -name '*.spec.c' -a -not -name '*.dbg.c' -print | ctags --c-types=+px -L - -manpages: - $(MKINSTALLDIRS) $(TOPOBJDIR)/documentation/man3w - cd dlls && $(MAKE) man - -htmlpages: - $(MKINSTALLDIRS) $(TOPOBJDIR)/documentation/html - cd dlls && $(MAKE) doc-html - -sgmlpages: - $(MKINSTALLDIRS) $(TOPOBJDIR)/documentation/api-guide - cd dlls && $(MAKE) doc-sgml +manpages htmlpages sgmlpages: + cd documentation && $(MAKE) $@ clean:: $(RM) wine @@ -161,6 +151,6 @@ distclean: clean $(RM) -r autom4te.cache $(RM) `find . \( -name Makefile -o -size 0 \) -print` -.PHONY: manpages htmlpages distclean +.PHONY: manpages htmlpages sgmlpages distclean ### Dependencies: diff --git a/documentation/Makefile.in b/documentation/Makefile.in index 3df282c3a18..4560de32242 100644 --- a/documentation/Makefile.in +++ b/documentation/Makefile.in @@ -8,9 +8,23 @@ EXTRASUBDIRS = samples @MAKE_RULES@ -install-api-man:: +manpages: + $(MKINSTALLDIRS) man$(api_manext) + cd $(DLLDIR) && $(MAKE) man + +htmlpages: + $(MKINSTALLDIRS) html + cd $(DLLDIR) && $(MAKE) doc-html + +sgmlpages: + $(MKINSTALLDIRS) api-guide + cd $(DLLDIR) && $(MAKE) doc-sgml + +.PHONY: manpages htmlpages sgmlpages + +install:: manpages $(MKINSTALLDIRS) $(mandir)/man$(api_manext) - for i in man$(api_manext)/*; do $(INSTALL_DATA) $$i $(mandir)/man$(api_manext); done + for i in man$(api_manext)/*.$(api_manext); do $(INSTALL_DATA) $$i $(mandir)/$$i; done clean:: $(RM) -r html api-guide man$(api_manext)