about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2004-10-31T16·13+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2004-10-31T16·13+0000
commit0d80d237c5d817c60c420a8a7870e296f202c1b3 (patch)
treedf83520f039cc4d5634bebb98ddb335a425fa350
parent2aa1f4717bdf9432a75f13088ec79644be9a7d88 (diff)
* Add figures to `make install' / `make dist'.
-rw-r--r--doc/manual/Makefile.am6
-rw-r--r--doc/manual/figures/user-environments.pngbin0 -> 16629 bytes
-rw-r--r--doc/manual/package-management.xml2
3 files changed, 6 insertions, 2 deletions
diff --git a/doc/manual/Makefile.am b/doc/manual/Makefile.am
index 0d1e85cc849a..98d85ecf7a96 100644
--- a/doc/manual/Makefile.am
+++ b/doc/manual/Makefile.am
@@ -10,6 +10,8 @@ man1_MANS = nix-env.1 nix-store.1 nix-instantiate.1 \
  nix-collect-garbage.1 nix-push.1 nix-pull.1 \
  nix-prefetch-url.1
 
+FIGURES = figures/user-environments.png
+
 SOURCES = manual.xml introduction.xml installation.xml \
  package-management.xml writing-nix-expressions.xml \
  build-farm.xml \
@@ -37,6 +39,8 @@ install-data-local: manual.html
 	$(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
 
 images:
 	mkdir images
@@ -47,6 +51,6 @@ images:
 
 KEEP = manual.html manual.is-valid version.xml $(MANS)
 
-EXTRA_DIST = $(SOURCES) $(KEEP)
+EXTRA_DIST = $(SOURCES) $(FIGURES) $(KEEP)
 
 DISTCLEANFILES = $(KEEP)
diff --git a/doc/manual/figures/user-environments.png b/doc/manual/figures/user-environments.png
new file mode 100644
index 000000000000..f8f1b0185048
--- /dev/null
+++ b/doc/manual/figures/user-environments.png
Binary files differdiff --git a/doc/manual/package-management.xml b/doc/manual/package-management.xml
index b717844b1141..0b7299e9af87 100644
--- a/doc/manual/package-management.xml
+++ b/doc/manual/package-management.xml
@@ -172,7 +172,7 @@ bla.</para>
 <figure><title>User environments</title>
   <mediaobject>
     <imageobject>
-      <imagedata fileref='figures/userenv-frame3.png' format='PNG' />
+      <imagedata fileref='figures/user-environments.png' format='PNG' />
     </imageobject>
   </mediaobject>
 </figure>