diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-07-11T22·53-0400 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-07-11T22·53-0400 |
| commit | 04559a0d45ad02fc760b09132cca0d875af035e5 (patch) | |
| tree | d7de1301fa9753467781dfc5d931959fcfae34bf /Makefile.am | |
| parent | e4d6bcb6cdc34d204ccf49e137dd5070f664c523 (diff) | |
| parent | eae802459d7639a69baec555264f394adad043c0 (diff) | |
Merge branch 'master' of github.com:NixOS/nix into no-manifests
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index f50cdf19b216..c97d0e266cd7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = src perl scripts corepkgs doc misc tests EXTRA_DIST = substitute.mk nix.spec nix.spec.in bootstrap.sh \ - nix.conf.example NEWS version misc/systemd/nix-worker.service + NEWS version misc/systemd/nix-worker.service pkginclude_HEADERS = config.h @@ -10,10 +10,6 @@ nix.spec: nix.spec.in install-data-local: init-state $(INSTALL) -d $(DESTDIR)$(sysconfdir)/nix - $(INSTALL_DATA) $(srcdir)/nix.conf.example $(DESTDIR)$(sysconfdir)/nix - if ! test -e $(DESTDIR)$(sysconfdir)/nix/nix.conf; then \ - $(INSTALL_DATA) $(srcdir)/nix.conf.example $(DESTDIR)$(sysconfdir)/nix/nix.conf; \ - fi $(INSTALL) -d $(DESTDIR)$(docdir) $(INSTALL_DATA) README $(DESTDIR)$(docdir)/ |