wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-28 22:01:15 +02:00
Code Activity

Drop the dependency on Automake

Browse source
This commit is contained in:
Eelco Dolstra 2013-11-22 19:30:24 +00:00
parent 754c05ed6c
commit 6b5f89f2cf
6 changed files with 18 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/Makefile.new
View file

@ -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)\"

2
src/libstore/globals.cc
View file

@ -212,7 +212,7 @@ Settings::SettingsMap Settings::getOverrides()
}
const string nixVersion = NIX_VERSION;
const string nixVersion = PACKAGE_VERSION;
}

4
src/libutil/Makefile.new
View file

@ -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