The realpath is not installed by default on Ubuntu.
Use pwd instead.
Fixes #946
Signed-off-by: Justin Cinkelj <justin.cink...@xlab.si>
---
modules/cli/rpmbuild/Makefile | 2 +-
modules/httpserver-api/Makefile | 2 +-
modules/lua/Makefile | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/modules/cli/rpmbuild/Makefile b/modules/cli/rpmbuild/Makefile
index ab52ea6..be9915d 100644
--- 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
index 3737b94..19cc526 100644
--- 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
index 9676f34..620a78f 100644
--- 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) \
--
1.9.1
--
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.
