diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-11-22 19:30:24 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-11-22 19:30:24 +0000 |
| commit | 6b5f89f2cf954cae1623a6cd3a8f7eb78e19e85b (patch) | |
| tree | 8edf557234e200d60daa9d472668ed89156d1877 /src/libstore | |
| parent | 754c05ed6c3b88f8180ae8686e030b5b02b23d43 (diff) | |
Drop the dependency on Automake
Diffstat (limited to 'src/libstore')
| -rw-r--r-- | src/libstore/Makefile.new | 2 | ||||
| -rw-r--r-- | src/libstore/globals.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libstore/Makefile.new b/src/libstore/Makefile.new index 2eb34b7b4..0a384e0b1 100644 --- a/src/libstore/Makefile.new +++ b/src/libstore/Makefile.new @@ -16,4 +16,4 @@ libstore_CXXFLAGS = \ -DNIX_CONF_DIR=\"$(sysconfdir)/nix\" \ -DNIX_LIBEXEC_DIR=\"$(libexecdir)\" \ -DNIX_BIN_DIR=\"$(bindir)\" \ - -DNIX_VERSION=\"$(PACKAGE_VERSION)\" + -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc index 1ecc629cb..68add1982 100644 --- a/src/libstore/globals.cc +++ b/src/libstore/globals.cc @@ -212,7 +212,7 @@ Settings::SettingsMap Settings::getOverrides() } -const string nixVersion = NIX_VERSION; +const string nixVersion = PACKAGE_VERSION; } |