Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

* Install documentation in $(docdir) (i.e. share/doc/nix).

  • Loading branch information...
commit 2369b122d19c7a08fc6e38e5a8aab90636ed4132 1 parent 6c2c771
@edolstra edolstra authored
Showing with 13 additions and 10 deletions.
  1. +2 −0  Makefile.am
  2. +5 −4 README
  3. +6 −6 doc/manual/Makefile.am
View
2  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
View
9 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/).
View
12 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
Please sign in to comment.
Something went wrong with that request. Please try again.