[project @ 2005-11-13 19:07:17 by panne]

Move the building guide to GHC where it belongs. This is more consistent and
currently even necessary, otherwise *every* fptools project would need the ghc
subtree.

diff --git a/docs/Makefile b/docs/Makefile
index 5005af5..a9140dd 100644 (file)
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -1,6 +1,6 @@
 TOP = ..
 include $(TOP)/mk/boilerplate.mk
 
-SUBDIRS = building docbook-cheat-sheet
+SUBDIRS = docbook-cheat-sheet
 
 include $(TOP)/mk/target.mk

diff --git a/ghc/docs/Makefile b/ghc/docs/Makefile
index 31081db..f34b509 100644 (file)
--- a/ghc/docs/Makefile
+++ b/ghc/docs/Makefile
@@ -1,7 +1,7 @@
 TOP = ..
 include $(TOP)/mk/boilerplate.mk
 
-SUBDIRS = users_guide ext-core storage-mgt
+SUBDIRS = building users_guide ext-core storage-mgt
 
 PAGES = index.html
 

diff --git a/docs/building/Makefile b/ghc/docs/building/Makefile
similarity index 100%
rename from docs/building/Makefile
rename to ghc/docs/building/Makefile

diff --git a/docs/building/building.xml b/ghc/docs/building/building.xml
similarity index 99%
rename from docs/building/building.xml
rename to ghc/docs/building/building.xml
index 6ea21e6..c99c015 100644 (file)
--- a/docs/building/building.xml
+++ b/ghc/docs/building/building.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
    "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-  <!ENTITY hacking SYSTEM "../../ghc/HACKING">
+  <!ENTITY hacking SYSTEM "../../HACKING">
 ]>
 
 <article id="building-guide">

diff --git a/ghc/ghc.spec.in b/ghc/ghc.spec.in
index 6af2ce3..87dc6e9 100644 (file)
--- a/ghc/ghc.spec.in
+++ b/ghc/ghc.spec.in
@@ -115,11 +115,11 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %files -f rpm-noprof-lib-files
 %defattr(-,root,root)
-%doc docs/building/building
 %doc docs/docbook-cheat-sheet/docbook-cheat-sheet
 %doc ghc/ANNOUNCE
 %doc ghc/LICENSE
 %doc ghc/README
+%doc ghc/docs/building/building
 %doc ghc/docs/ext-core/core.ps
 %doc ghc/docs/storage-mgt/ldv.ps
 %doc ghc/docs/storage-mgt/rp.ps