forked from lix-project/lix
* Do initialise state (the DB etc.) when doing a `make install',
unless `--disable-init-state' is passed to configure.
This commit is contained in:
parent
8e459d919d
commit
f79e9c2d22
13
Makefile.am
13
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
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue