From 4e4d8e70295de6dcfaa77de4e7ce89123a3d190d Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Sat, 24 Nov 2007 21:23:05 +0000 Subject: [PATCH] MERGED: Put library docs in a $pkg, rather than $pkgid, directory; fixes trac #1864 Ian Lynagh **20071124171220 --- libraries/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libraries/Makefile b/libraries/Makefile index 190e9ce..ab5337f 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -95,9 +95,9 @@ ibindir = $$topdir ilibdir = $$topdir ilibexecdir = $$topdir idatadir = $$topdir -idocdir = $$topdir/doc/libraries/$$pkgid -iinterfacedir = $$topdir/doc/libraries/$$pkgid -ihtmldir = $$httptopdir/doc/libraries/$$pkgid +idocdir = $$topdir/doc/libraries/$$pkg +iinterfacedir = $$topdir/doc/libraries/$$pkg +ihtmldir = $$httptopdir/doc/libraries/$$pkg html_installed_root = $(prefix)/doc/libraries else # On non-Windows we can just give absolute paths all the time, and @@ -107,9 +107,9 @@ ibindir = $(bindir) ilibdir = $(libdir) ilibexecdir = $(libexecdir) idatadir = $(datadir) -idocdir = $(docdir)/libraries/$$pkgid -iinterfacedir = $(htmldir)/libraries/$$pkgid -ihtmldir = $(htmldir)/libraries/$$pkgid +idocdir = $(docdir)/libraries/$$pkg +iinterfacedir = $(htmldir)/libraries/$$pkg +ihtmldir = $(htmldir)/libraries/$$pkg html_installed_root = $(htmldir)/libraries endif @@ -296,7 +296,7 @@ $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)):\ doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ %/setup/Setup ifBuildable/ifBuildable if ifBuildable/ifBuildable $*; then \ - cd $* && setup/Setup haddock --html-location='../$$pkgid' \ + cd $* && setup/Setup haddock --html-location='../$$pkg' \ $(CABAL_HADDOCK_FLAGS); \ fi -- 1.7.10.4