From 624b21b900aee236d79da91ec18651710d3c31ed Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Mon, 22 Jun 2015 11:12:39 +0200 Subject: Set RPATH to $ORIGIN for ./botan and ./botan-test This makes setting LD_LIBRARY_PATH obsolete when Botan lib and botan /botan-test binary are in the same directory. This behavior is default on Windows. LD_LIBRARY_PATH can still be used to override the RPATH. --- src/build-data/makefile/nmake.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/build-data/makefile/nmake.in') diff --git a/src/build-data/makefile/nmake.in b/src/build-data/makefile/nmake.in index 6454e46ea..c89eb7f44 100644 --- a/src/build-data/makefile/nmake.in +++ b/src/build-data/makefile/nmake.in @@ -42,10 +42,10 @@ all: $(APP) $(TEST) # Link Commands $(APP): $(LIBRARIES) $(APPOBJS) - $(CXX) /Fe$@ $(APPOBJS) $(LIB_FILENAME) $(APP_LINKS_TO) + $(APP_LINK_CMD) /Fe$@ $(APPOBJS) $(LIB_FILENAME) $(APP_LINKS_TO) $(TEST): $(LIBRARIES) $(TESTOBJS) - $(CXX) /Fe$@ $(TESTOBJS) $(LIB_FILENAME) $(TEST_LINKS_TO) + $(TEST_LINK_CMD) /Fe$@ $(TESTOBJS) $(LIB_FILENAME) $(TEST_LINKS_TO) $(LIB_FILENAME): $(LIBOBJS) !If "$(SO_OBJ_FLAGS)" == "" -- cgit v1.2.3