about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am13
-rw-r--r--configure.ac5
-rw-r--r--nix.spec.in1
-rw-r--r--src/nix-store/Makefile.am7
4 files changed, 18 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am
index cb50401357c8..720279460ae7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,3 +10,16 @@ rpm: nix.spec dist
 
 relname:
 	echo -n $(distdir) > relname
+
+install-data-local: init-state
+
+if INIT_STATE
+init-state:
+	$(INSTALL) -d $(DESTDIR)$(localstatedir)/nix
+	$(INSTALL) -d $(DESTDIR)$(localstatedir)/nix/db
+	$(INSTALL) -d $(DESTDIR)$(localstatedir)/log/nix
+	$(INSTALL) -d $(DESTDIR)$(prefix)/store
+#	$(bindir)/nix-store --init
+else
+init-state:
+endif
\ No newline at end of file
diff --git a/configure.ac b/configure.ac
index 1c42194c1580..df9e8249a8e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -114,6 +114,11 @@ AC_SUBST(aterm_include)
 
 AC_CHECK_LIB(pthread, pthread_mutex_init)
 
+AC_ARG_ENABLE(init-state, AC_HELP_STRING([--disable-init-state],
+  [do not initialise DB etc. in `make install']),
+  init_state=$enableval, init_state=yes)
+AM_CONDITIONAL(INIT_STATE, test "$init_state" = "yes")
+
 AM_CONFIG_HEADER([config.h])
 AC_CONFIG_FILES([Makefile
    externals/Makefile
diff --git a/nix.spec.in b/nix.spec.in
index 81344ffdd60a..41765aa6c424 100644
--- a/nix.spec.in
+++ b/nix.spec.in
@@ -25,7 +25,6 @@ make
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
-(cd src/nix-store && make DESTDIR=$RPM_BUILD_ROOT init-state-local)
 strip $RPM_BUILD_ROOT/%{_prefix}/bin/* || true
 
 %clean
diff --git a/src/nix-store/Makefile.am b/src/nix-store/Makefile.am
index 588d645eb67b..c1fda12b5753 100644
--- a/src/nix-store/Makefile.am
+++ b/src/nix-store/Makefile.am
@@ -11,10 +11,3 @@ main.o: help.txt.hh
 
 AM_CXXFLAGS = \
  -I.. ${bdb_include} $(aterm_include) -I../libutil -I../libstore -I../libmain
-
-init-state-local:
-	$(INSTALL) -d $(DESTDIR)$(localstatedir)/nix
-	$(INSTALL) -d $(DESTDIR)$(localstatedir)/nix/db
-	$(INSTALL) -d $(DESTDIR)$(localstatedir)/log/nix
-	$(INSTALL) -d $(DESTDIR)$(prefix)/store
-#	$(bindir)/nix-store --init