Commit 8d50356e authored by deuce's avatar deuce
Browse files

Make SRC_ROOT an absolute path so that LD_RUN_PATH works for user-specified

library dirs.
parent 37ba19b4
......@@ -13,7 +13,8 @@
# $Id$
SRC_ROOT = ..
PWD := $(shell pwd)
SRC_ROOT ?= ${PWD}/..
include $(SRC_ROOT)/build/Common.gmake
UTIL_LDFLAGS := $(LDFLAGS)
......@@ -109,18 +110,17 @@ include sbbsdefs.mk
MT_CFLAGS += $(SBBSDEFS)
# Set up LD_RUN_PATH for run-time locating of the .so files
PWD := $(shell pwd)
ifdef SBBSDIR
ifeq ($(os),sunos)
LD_RUN_PATH := $(SBBSDIR)/exec:$(PWD)/$(LIBODIR):$(PWD)/$(JSLIBDIR):$(PWD)/$(NSPRDIR):$(PWD)/$(CRYPTLIBDIR):/opt/sfw/gcc-3/lib
LD_RUN_PATH := $(SBBSDIR)/exec:$(LIBODIR):$(JSLIBDIR):$(NSPRDIR):$(CRYPTLIBDIR):/opt/sfw/gcc-3/lib
else
LD_RUN_PATH := $(SBBSDIR)/exec:$(PWD)/$(LIBODIR):$(PWD)/$(JSLIBDIR):$(PWD)/$(NSPRDIR):$(PWD)/$(CRYPTLIBDIR)
LD_RUN_PATH := $(SBBSDIR)/exec:$(LIBODIR):$(JSLIBDIR):$(NSPRDIR):$(CRYPTLIBDIR)
endif
else
ifeq ($(os),sunos)
LD_RUN_PATH := $(PWD)/$(LIBODIR):$(PWD)/$(JSLIBDIR):$(PWD)/$(NSPRDIR):$(PWD)/$(CRYPTLIBDIR):/opt/sfw/gcc-3/lib
LD_RUN_PATH := $(LIBODIR):$(JSLIBDIR):$(NSPRDIR):$(CRYPTLIBDIR):/opt/sfw/gcc-3/lib
else
LD_RUN_PATH := $(PWD)/$(LIBODIR):$(PWD)/$(JSLIBDIR):$(PWD)/$(NSPRDIR):$(PWD)/$(CRYPTLIBDIR)
LD_RUN_PATH := $(LIBODIR):$(JSLIBDIR):$(NSPRDIR):$(CRYPTLIBDIR)
endif
endif
export LD_RUN_PATH
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment