diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2004-02-16T15·23+0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2004-02-16T15·23+0000 |
| commit | f34de121401bb43c6cfab892b2b254e42652ba90 (patch) | |
| tree | 7d421aefeabf597679a81a92139c9a338be2cfdd | |
| parent | fbc48a469c80201f0d159a9b9f48a22ce5f36984 (diff) | |
* Allow the location of the store to be specified (--with-store-dir).
* Do not create stuff in localstatedir when doing `make install' (since we may not have write access). In general, installation of constant code/data should be separate from the initialisation of mutable state.
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | nix.spec.in | 1 | ||||
| -rw-r--r-- | src/libmain/Makefile.am | 2 | ||||
| -rw-r--r-- | src/nix-store/Makefile.am | 2 |
4 files changed, 8 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index c6cb782d8f6e..b8d51916a626 100644 --- a/configure.ac +++ b/configure.ac @@ -63,6 +63,11 @@ AC_ARG_WITH(xml-flags, AC_HELP_STRING([--with-xml-flags=FLAGS], xmlflags=$withval, xmlflags=) AC_SUBST(xmlflags) +AC_ARG_WITH(store-dir, AC_HELP_STRING([--with-store-dir=PATH], + [path of the Nix store]), + storedir=$withval, storedir='${prefix}/store') +AC_SUBST(storedir) + AC_CHECK_LIB(pthread, pthread_mutex_init) AM_CONFIG_HEADER([config.h]) diff --git a/nix.spec.in b/nix.spec.in index 6fdd93e9f2e9..e2537960e23e 100644 --- a/nix.spec.in +++ b/nix.spec.in @@ -24,6 +24,7 @@ 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/libmain/Makefile.am b/src/libmain/Makefile.am index 6d70b0406acc..72126f1135c4 100644 --- a/src/libmain/Makefile.am +++ b/src/libmain/Makefile.am @@ -3,7 +3,7 @@ noinst_LIBRARIES = libmain.a libmain_a_SOURCES = shared.cc shared.hh AM_CXXFLAGS = \ - -DNIX_STORE_DIR=\"$(prefix)/store\" \ + -DNIX_STORE_DIR=\"$(storedir)\" \ -DNIX_DATA_DIR=\"$(datadir)\" \ -DNIX_STATE_DIR=\"$(localstatedir)/nix\" \ -DNIX_LOG_DIR=\"$(localstatedir)/log/nix\" \ diff --git a/src/nix-store/Makefile.am b/src/nix-store/Makefile.am index 3a152e3e4b3d..76d3a6c6bedc 100644 --- a/src/nix-store/Makefile.am +++ b/src/nix-store/Makefile.am @@ -12,7 +12,7 @@ main.o: help.txt.hh AM_CXXFLAGS = \ -I.. -I../../externals/inst/include -I../libutil -I../libstore -I../libmain -install-data-local: +init-state-local: $(INSTALL) -d $(DESTDIR)$(localstatedir)/nix $(INSTALL) -d $(DESTDIR)$(localstatedir)/nix/db $(INSTALL) -d $(DESTDIR)$(localstatedir)/log/nix |