X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2FMakefile;h=63206959173e9699675b5ebb46f2b8dc522fd4f5;hb=0e661055e1233e585fb259832e4884f68d3833a4;hp=0f8c0997fe9dcff77db7005332cc9ce10e8a5f1a;hpb=b80c9b0941d4e06e9de27e8cf81d45c2f3752714;p=rocksndiamonds.git

diff --git a/src/Makefile b/src/Makefile
index 0f8c0997..63206959 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -117,6 +117,8 @@ OPTIONS = $(DEBUG) -Wall			# only for debugging purposes
 # OPTIONS = -O3
 
 ifdef BUILD_DIST			# distribution build
+SYS_LDFLAGS := $(shell echo $(SYS_LDFLAGS) |	\
+		       sed -e "s%-rpath,[^ ]*%-rpath,'\$$ORIGIN/lib'%")
 OPTIONS = -O3 -Wall
 endif
 
@@ -265,7 +267,7 @@ $(ICON):
 	$(CC) $(PROFILING) $(CFLAGS) -c $*.c
 
 graphics_dir:
-	@$(MAKE) -C $(GRAPHICS_DIR)
+	@test -f $(GRAPHICS_DIR)/Makefile && $(MAKE) -C $(GRAPHICS_DIR) || true
 
 clean-obj:
 	$(MAKE) -C $(LIBGAME_DIR) clean