Update Makefile variable names

12 files changed, 13 insertions, 13 deletions

diff --git a/src/boost/format/local.mk b/src/boost/format/local.mk
index 17897fa590..3776eff382 100644
--- a/src/boost/format/local.mk
+++ b/src/boost/format/local.mk
@@ -1,4 +1,4 @@
-LIBS += libformat
+libraries += libformat
 
 libformat_NAME = libnixformat
 
diff --git a/src/bsdiff-4.3/local.mk b/src/bsdiff-4.3/local.mk
index aca1ac1162..320795a94c 100644
--- a/src/bsdiff-4.3/local.mk
+++ b/src/bsdiff-4.3/local.mk
@@ -1,4 +1,4 @@
-PROGRAMS += bsdiff bspatch
+programs += bsdiff bspatch
 
 bsdiff_DIR := $(d)
 bsdiff_SOURCES := $(d)/bsdiff.c
@@ -10,4 +10,4 @@ bspatch_SOURCES := $(d)/bspatch.c
 bspatch_LDFLAGS = -lbz2 $(bsddiff_compat_include)
 bspatch_INSTALL_DIR = $(libexecdir)/nix
 
-dist_files += $(d)/compat-include/*
+dist-files += $(d)/compat-include/*
diff --git a/src/libexpr/local.mk b/src/libexpr/local.mk
index de276aa652..ff35155b1a 100644
--- a/src/libexpr/local.mk
+++ b/src/libexpr/local.mk
@@ -1,4 +1,4 @@
-LIBS += libexpr
+libraries += libexpr
 
 libexpr_NAME = libnixexpr
 
diff --git a/src/libmain/local.mk b/src/libmain/local.mk
index 0efeee5314..71a07d1979 100644
--- a/src/libmain/local.mk
+++ b/src/libmain/local.mk
@@ -1,4 +1,4 @@
-LIBS += libmain
+libraries += libmain
 
 libmain_NAME = libnixmain
 
diff --git a/src/libstore/local.mk b/src/libstore/local.mk
index dcedd4c26a..a9ae532700 100644
--- a/src/libstore/local.mk
+++ b/src/libstore/local.mk
@@ -1,4 +1,4 @@
-LIBS += libstore
+libraries += libstore
 
 libstore_NAME = libnixstore
 
diff --git a/src/libutil/local.mk b/src/libutil/local.mk
index 83bd05f281..8af2e78d9c 100644
--- a/src/libutil/local.mk
+++ b/src/libutil/local.mk
@@ -1,4 +1,4 @@
-LIBS += libutil
+libraries += libutil
 
 libutil_NAME = libnixutil
 
diff --git a/src/nix-daemon/local.mk b/src/nix-daemon/local.mk
index d02f9f6ce2..db071a3f7c 100644
--- a/src/nix-daemon/local.mk
+++ b/src/nix-daemon/local.mk
@@ -1,4 +1,4 @@
-PROGRAMS += nix-daemon
+programs += nix-daemon
 
 nix-daemon_DIR := $(d)
 
diff --git a/src/nix-env/local.mk b/src/nix-env/local.mk
index 5a38d2fb76..e80719cd76 100644
--- a/src/nix-env/local.mk
+++ b/src/nix-env/local.mk
@@ -1,4 +1,4 @@
-PROGRAMS += nix-env
+programs += nix-env
 
 nix-env_DIR := $(d)
 
diff --git a/src/nix-hash/local.mk b/src/nix-hash/local.mk
index 062e4d13b2..7c290ca846 100644
--- a/src/nix-hash/local.mk
+++ b/src/nix-hash/local.mk
@@ -1,4 +1,4 @@
-PROGRAMS += nix-hash
+programs += nix-hash
 
 nix-hash_DIR := $(d)
 
diff --git a/src/nix-instantiate/local.mk b/src/nix-instantiate/local.mk
index daa741eb7f..7d1bc5ec9d 100644
--- a/src/nix-instantiate/local.mk
+++ b/src/nix-instantiate/local.mk
@@ -1,4 +1,4 @@
-PROGRAMS += nix-instantiate
+programs += nix-instantiate
 
 nix-instantiate_DIR := $(d)
 
diff --git a/src/nix-log2xml/local.mk b/src/nix-log2xml/local.mk
index 8467d1973b..46eb2e02ca 100644
--- a/src/nix-log2xml/local.mk
+++ b/src/nix-log2xml/local.mk
@@ -1,4 +1,4 @@
-PROGRAMS += nix-log2xml
+programs += nix-log2xml
 
 nix-log2xml_DIR := $(d)
 
diff --git a/src/nix-store/local.mk b/src/nix-store/local.mk
index edd111b420..7f93e4c191 100644
--- a/src/nix-store/local.mk
+++ b/src/nix-store/local.mk
@@ -1,4 +1,4 @@
-PROGRAMS += nix-store
+programs += nix-store
 
 nix-store_DIR := $(d)