aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2004-04-22 07:47:41 +0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2004-04-22 07:47:41 +0000
commitd7238bc84ebd8356db6d73a80171f1129bbe3d44 (patch)
treecfcab41b76bf75669f57cd8a748215d2fba35bfc
parentb6df68c9429896ba6017f60d1ce3a95ede9afe72 (diff)
* Don't create $(localstatedir)/nix/profiles if --disable-init-state
is specified.
-rw-r--r--Makefile.am1
-rw-r--r--src/nix-env/Makefile.am3
2 files changed, 1 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 720279460..d25ccc5c2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,6 +18,7 @@ init-state:
$(INSTALL) -d $(DESTDIR)$(localstatedir)/nix
$(INSTALL) -d $(DESTDIR)$(localstatedir)/nix/db
$(INSTALL) -d $(DESTDIR)$(localstatedir)/log/nix
+ $(INSTALL) -d $(DESTDIR)$(localstatedir)/nix/profiles
$(INSTALL) -d $(DESTDIR)$(prefix)/store
# $(bindir)/nix-store --init
else
diff --git a/src/nix-env/Makefile.am b/src/nix-env/Makefile.am
index 3943a9d9a..49282f169 100644
--- a/src/nix-env/Makefile.am
+++ b/src/nix-env/Makefile.am
@@ -14,6 +14,3 @@ main.o: help.txt.hh
AM_CXXFLAGS = \
-I.. ${bdb_include} ${aterm_include} -I../libutil -I../libstore \
-I../libexpr -I../libmain
-
-install-data-local:
- $(INSTALL) -d $(DESTDIR)$(localstatedir)/nix/profiles