Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Alex D
GHC
Commits
4e4d8e70
Commit
4e4d8e70
authored
Nov 24, 2007
by
Ian Lynagh
Browse files
MERGED: Put library docs in a $pkg, rather than $pkgid, directory; fixes trac #1864
Ian Lynagh <igloo@earth.li>**20071124171220
parent
07cb9d54
Changes
1
Hide whitespace changes
Inline
Side-by-side
libraries/Makefile
View file @
4e4d8e70
...
...
@@ -95,9 +95,9 @@ ibindir = $$topdir
ilibdir
=
$$
topdir
ilibexecdir
=
$$
topdir
idatadir
=
$$
topdir
idocdir
=
$$
topdir/doc/libraries/
$$
pkg
id
iinterfacedir
=
$$
topdir/doc/libraries/
$$
pkg
id
ihtmldir
=
$$
httptopdir/doc/libraries/
$$
pkg
id
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/
$$
pkg
id
iinterfacedir
=
$(htmldir)
/libraries/
$$
pkg
id
ihtmldir
=
$(htmldir)
/libraries/
$$
pkg
id
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
=
'../$$pkg
id
'
\
cd
$*
&&
setup/Setup haddock
--html-location
=
'../$$pkg'
\
$(CABAL_HADDOCK_FLAGS)
;
\
fi
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment