From: Justin Cinkelj <justin.cink...@xlab.si>
Committer: Nadav Har'El <n...@scylladb.com>
Branch: master
Makefile: replace realpath with pwd
The realpath is not installed by default on Ubuntu.
Use pwd instead.
Fixes #946
Signed-off-by: Justin Cinkelj <justin.cink...@xlab.si>
Message-Id: <20180215094509.28751-1-justin.cink...@xlab.si>
---
diff --git a/modules/cli/rpmbuild/Makefile b/modules/cli/rpmbuild/Makefile
--- a/modules/cli/rpmbuild/Makefile
+++ b/modules/cli/rpmbuild/Makefile
@@ -1,4 +1,4 @@
-ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
+ROOT_DIR := $(shell pwd)
CLI_ROOT=$(ROOT_DIR)/..
LUA_DIR=$(CLI_ROOT)/../lua
VERSION=1.0
diff --git a/modules/httpserver-api/Makefile
b/modules/httpserver-api/Makefile
--- a/modules/httpserver-api/Makefile
+++ b/modules/httpserver-api/Makefile
@@ -54,7 +54,7 @@ all: lib$(TARGET).so api_api api_app api_env api_file
api_fs api_hardware api_ne
$(call quiet, cat _usr_*.manifest | sort | uniq > usr.manifest,
CREATE_MANIFEST)
add_api_to_manifest = \
- echo "/usr/mgmt/plugins/libhttpserver-$(1).so: `realpath
libhttpserver-$(1).so`" > _usr_$(1).manifest
+ echo "/usr/mgmt/plugins/libhttpserver-$(1).so:
`pwd`/libhttpserver-$(1).so" > _usr_$(1).manifest
add_boost_dependencies_to_manifest = \
ldd libhttpserver-$(1).so | grep boost | sed 's/ *[^ ] *\(.*\) =>
\(.*\) .*/\/usr\/lib\/\1: \2/' > _usr_$(1)_boost.manifest
diff --git a/modules/lua/Makefile b/modules/lua/Makefile
--- a/modules/lua/Makefile
+++ b/modules/lua/Makefile
@@ -71,7 +71,7 @@ $(BUILD)/$(LuaRocks_F)/src/luarocks:
$(BUILD)/$(LuaRocks_F)/Makefile
make build
$(BUILD)/$(LuaRocks_F)/Makefile: $(BUILD)/$(LuaRocks_F)/configure
- $(eval PREFIX=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))))
+ $(eval PREFIX=$(shell pwd))
cd $(BUILD)/$(LuaRocks_F) && \
./configure --prefix=$(PREFIX)/$(OUT) --force-config \
--with-lua-include=$(PREFIX)/src --lua-version=$(LUA_V) \
--
You received this message because you are subscribed to the Google Groups "OSv
Development" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to osv-dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
