X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Ftarget.mk;h=4ef96a45e0fb13c6ecb9faaaed31808f379761e8;hb=3463d1d3725bd4ec70acb2656ff20571b9b59294;hp=8aac7d30c54a5cfc921ceee39fd1da6ea41ece91;hpb=baf4a0612e370ebe0f397c27024feb8ced23e08a;p=ghc-hetmet.git

diff --git a/mk/target.mk b/mk/target.mk
index 8aac7d3..4ef96a4 100644
--- a/mk/target.mk
+++ b/mk/target.mk
@@ -318,6 +318,7 @@ $(AR) $(AR_OPTS) $@ $(ArSupportsInput) $@.list
 $(RM) $@.list
 $(RANLIB) $@
 endef
+endif
 
 # Extra stuff for compiling Haskell files with $(SplitObjs):
 
@@ -359,7 +360,6 @@ extraclean ::
 	$(FIND) $(patsubst %.$(way_)o,%_split,$(HS_OBJS)) -name '*.$(way_)o' -print | xargs $(RM) __rm_food
 	-rmdir $(patsubst %.$(way_)o,%_split,$(HS_OBJS)) > /dev/null 2>&1
 
-endif # $(way) == u
 endif # $(SplitObjs)
 endif # $(HS_SRCS)
 
@@ -727,6 +727,9 @@ install:: $(INSTALL_PROGS)
 	@for i in $(INSTALL_PROGS); do \
 		    echo $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i $(bindir); \
 		    $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i $(bindir) ;  \
+                    if `test $(darwin_TARGET_OS) == 1` ; \
+                    then sh $(FPTOOLS_TOP)/mk/fix_install_names.sh $(libdir) $(bindir)/$$i ; \
+                    fi ; \
 	done
 endif
 
@@ -770,6 +773,9 @@ install:: $(INSTALL_LIBS)
 		    $(INSTALL_DATA) -s $(INSTALL_OPTS) $$i $(libdir) ;; \
 		  *.so) \
 		    $(INSTALL_SHLIB) $(INSTALL_OPTS) $$i $(libdir) ;; \
+		  *.dylib) \
+		    $(INSTALL_SHLIB) $(INSTALL_OPTS) $$i $(libdir); \
+		    install_name_tool -id $(libdir)/`basename $$i` $(libdir)/`basename $$i` ;; \
 		  *) \
 		    $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(libdir); \
 		esac; \