about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2008-11-19T13·19+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2008-11-19T13·19+0000
commit2369b122d19c7a08fc6e38e5a8aab90636ed4132 (patch)
tree28a95d3cd2e41962096ab1b653738f69a089c2f8
parent6c2c771af7b1fc35a33e1faf0e4e7b266fe44e79 (diff)
* Install documentation in $(docdir) (i.e. share/doc/nix).
-rw-r--r--Makefile.am2
-rw-r--r--README9
-rw-r--r--doc/manual/Makefile.am12
3 files changed, 13 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am
index 5454b55a9c9e..550b9b7c690f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,6 +18,8 @@ install-data-local: init-state
 	if ! test -e $(DESTDIR)$(sysconfdir)/nix/nix.conf; then \
 		$(INSTALL_DATA) $(srcdir)/nix.conf.example $(DESTDIR)$(sysconfdir)/nix/nix.conf; \
 	fi
+	$(INSTALL) -d $(DESTDIR)$(docdir)
+	$(INSTALL_DATA) README $(DESTDIR)$(docdir)/
 
 if INIT_STATE
 
diff --git a/README b/README
index f596f42bea2d..35a1f6cc08c9 100644
--- a/README
+++ b/README
@@ -1,9 +1,10 @@
-For installation and usage instructions, please read the manual, which
-can be found in `docs/manual/manual.html', and additionally at the Nix
-website at <http://nixos.org/>.
+Nix is a purely functional package manager.  For installation and
+usage instructions, please read the manual, which can be found in
+`docs/manual/manual.html', and additionally at the Nix website at
+<http://nixos.org/>.
 
 
 Acknowledgments
 
 This product includes software developed by the OpenSSL Project for
-use in the OpenSSL Toolkit (http://www.OpenSSL.org/)
+use in the OpenSSL Toolkit (http://www.OpenSSL.org/).
diff --git a/doc/manual/Makefile.am b/doc/manual/Makefile.am
index 62a7e9bff410..20c9e1beec4f 100644
--- a/doc/manual/Makefile.am
+++ b/doc/manual/Makefile.am
@@ -75,12 +75,12 @@ NEWS.txt: release-notes.xml
 all-local: manual.html NEWS.html NEWS.txt
 
 install-data-local: manual.html
-	$(INSTALL) -d $(DESTDIR)$(datadir)/nix/manual
-	$(INSTALL_DATA) manual.html $(DESTDIR)$(datadir)/nix/manual
-	$(INSTALL_DATA) style.css $(DESTDIR)$(datadir)/nix/manual
-	cp -r images $(DESTDIR)$(datadir)/nix/manual/images
-	$(INSTALL) -d $(DESTDIR)$(datadir)/nix/manual/figures
-	$(INSTALL_DATA) $(FIGURES) $(DESTDIR)$(datadir)/nix/manual/figures
+	$(INSTALL) -d $(DESTDIR)$(docdir)/manual
+	$(INSTALL_DATA) manual.html $(DESTDIR)$(docdir)/manual
+	$(INSTALL_DATA) style.css $(DESTDIR)$(docdir)/manual
+	cp -r images $(DESTDIR)$(docdir)/manual/images
+	$(INSTALL) -d $(DESTDIR)$(docdir)/manual/figures
+	$(INSTALL_DATA) $(FIGURES) $(DESTDIR)$(docdir)/manual/figures
 
 images:
 	mkdir images