summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLawrence Chan <element103@gmail.com>2019-07-17 18:18:26 -0500
committerLawrence Chan <element103@gmail.com>2019-07-17 22:02:58 -0500
commit2be57e13869ecfe248fb87abad762eaa24a10a47 (patch)
treec3cd4ccde0df31ff5a40582c0b484e54f85b80c3
parent1c02905ec7af9f63a35ee05e9e9ce594c45c4c58 (diff)
downloadpodman-2be57e13869ecfe248fb87abad762eaa24a10a47.tar.gz
podman-2be57e13869ecfe248fb87abad762eaa24a10a47.tar.bz2
podman-2be57e13869ecfe248fb87abad762eaa24a10a47.zip
Make GOPATH-related symlinking more precise
This change tweaks the symlink commands that are invoked when libpod is not on GOPATH. This has the following effects: - If the working directory is not "libpod", it will still create the symlink at the correct github.com/containers/libpod path. - If the github.com/varlink directory/symlink already exists, it will still create the symlink at the intended path. Signed-off-by: Lawrence Chan <element103@gmail.com>
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 3c7f9d74b..e155d31d4 100644
--- a/Makefile
+++ b/Makefile
@@ -127,8 +127,8 @@ help:
.gopathok:
ifeq ("$(wildcard $(GOPKGDIR))","")
mkdir -p "$(GOPKGBASEDIR)"
- ln -sf "$(CURDIR)" "$(GOPKGBASEDIR)"
- ln -sf "$(CURDIR)/vendor/github.com/varlink" "$(FIRST_GOPATH)/src/github.com/varlink"
+ ln -sfnT "$(CURDIR)" "$(GOPKGDIR)"
+ ln -sfnT "$(CURDIR)/vendor/github.com/varlink" "$(FIRST_GOPATH)/src/github.com/varlink"
endif
touch $@