--- ./wmake/Makefile.orig	2008-06-27 13:19:31.000000000 +0200
+++ ./wmake/Makefile	2008-07-21 17:26:31.000000000 +0200
@@ -60,8 +60,8 @@
 OBJECTS_DIR        = $(MAKE_DIR)/$(WM_OPTIONS)
 CLASSES_DIR        = $(MAKE_DIR)/classes
 
-SYS_INC            =
-SYS_LIBS           =
+SYS_INC            = -I$(LOCALBASE)/include
+SYS_LIBS           = -L$(LOCALBASE)/lib
 
 PROJECT_INC        = -I$(LIB_SRC)/$(WM_PROJECT)/lnInclude -I$(LIB_SRC)/OSspecific/$(WM_OS)/lnInclude
 PROJECT_LIBS       = -l$(WM_PROJECT)
@@ -144,6 +144,7 @@
 $(EXE):  $(OBJECTS)
 	     @$(WM_SCRIPTS)/mkObjectDir $(EXE)
 	     $(LINKEXE) $(OBJECTS) -L$(LIB_WM_OPTIONS_DIR) \
+	     -rpath-link $(LIB_WM_OPTIONS_DIR) -rpath-link $(FOAM_MPI_LIBBIN) \
 	     $(EXE_LIBS) $(PROJECT_LIBS) $(SYS_LIBS) $(LINK_LIBS) $(GLIBS) -o $(EXE)
 
 exe:     $(SEXE)
