summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-10-31 19:21:46 +0100
committerGitHub <noreply@github.com>2019-10-31 19:21:46 +0100
commit3e2d9f8662663f2f703bf674408d5255e493e18e (patch)
treed27099f29c134e4351c98674d72cf42abf5efbe8 /Makefile
parent1e750f7ca874ed24781de27cccf0346e5ec247bf (diff)
parent11c282ab02e5e7daca0b13a3ddc9bbc4468e7a31 (diff)
downloadpodman-3e2d9f8662663f2f703bf674408d5255e493e18e.tar.gz
podman-3e2d9f8662663f2f703bf674408d5255e493e18e.tar.bz2
podman-3e2d9f8662663f2f703bf674408d5255e493e18e.zip
Merge pull request #4352 from vrothberg/config-package
refactor libpod config into libpod/config
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index d4d123d69..f19b00687 100644
--- a/Makefile
+++ b/Makefile
@@ -73,8 +73,8 @@ ASMFLAGS ?= all=-trimpath=${PWD}
LDFLAGS_PODMAN ?= $(LDFLAGS) \
-X $(LIBPOD)/define.gitCommit=$(GIT_COMMIT) \
-X $(LIBPOD)/define.buildInfo=$(BUILD_INFO) \
- -X $(LIBPOD).installPrefix=$(PREFIX) \
- -X $(LIBPOD).etcDir=$(ETCDIR)
+ -X $(LIBPOD)/config._installPrefix=$(PREFIX) \
+ -X $(LIBPOD)/config._etcDir=$(ETCDIR)
#Update to LIBSECCOMP_COMMIT should reflect in Dockerfile too.
LIBSECCOMP_COMMIT := release-2.3
# Rarely if ever should integration tests take more than 50min,