diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-11-22T19·30+0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-11-22T19·30+0000 |
| commit | 6b5f89f2cf954cae1623a6cd3a8f7eb78e19e85b (patch) | |
| tree | 8edf557234e200d60daa9d472668ed89156d1877 /src | |
| parent | 754c05ed6c3b88f8180ae8686e030b5b02b23d43 (diff) | |
Drop the dependency on Automake
Diffstat (limited to 'src')
| -rw-r--r-- | src/libstore/Makefile.new | 2 | ||||
| -rw-r--r-- | src/libstore/globals.cc | 2 | ||||
| -rw-r--r-- | src/libutil/Makefile.new | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/libstore/Makefile.new b/src/libstore/Makefile.new index 2eb34b7b4252..0a384e0b1d44 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 1ecc629cb55f..68add1982f43 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; } diff --git a/src/libutil/Makefile.new b/src/libutil/Makefile.new index 88d43f0aeb62..7871a4ddb8c8 100644 --- a/src/libutil/Makefile.new +++ b/src/libutil/Makefile.new @@ -4,7 +4,9 @@ libutil_DIR := $(d) libutil_SOURCES = util.cc hash.cc serialise.cc archive.cc xml-writer.cc affinity.cc -ifneq ($(HAVE_OPENSSL), 1) +ifeq ($(HAVE_OPENSSL), 1) +libutil_LDFLAGS = $(OPENSSL_LIBS) +else libutil_SOURCES += md5.c sha1.c sha256.c endif |