[project @ 2002-01-23 17:51:46 by lewie]

[ghc-hetmet.git] / mk / target.mk

diff --git a/mk/target.mk b/mk/target.mk
index 4fb1ec1..59f00ef 100644 (file)
--- a/mk/target.mk
+++ b/mk/target.mk
@@ -257,7 +257,13 @@ endif
 ifneq "$(PACKAGE)" ""
 
 # add syslib dependencies and current package name
+
+# HACK!!! The conditional below is needed because we pass $(HC_OPTS)
+# directly to mkdependC and sometimes the C compiler in ghc/rts. Todo.
+ifneq "$(PACKAGE)" "rts"
 SRC_HC_OPTS += -package-name $(PACKAGE)
+endif
+
 SRC_HC_OPTS += $(patsubst %, -package %, $(PACKAGE_DEPS))
 
 ifeq "$(IS_CBITS_LIB)" "YES"
@@ -833,6 +839,8 @@ install:: $(INSTALL_LIBS)
                    $(RANLIB) $(libdir)/`basename $$i` ;; \
                  *.dll) \
                    $(INSTALL_DATA) -s $(INSTALL_OPTS) $$i $(libdir) ;; \
+                 *.so) \
+                   $(INSTALL_SHLIB) $(INSTALL_OPTS) $$i $(libdir) ;; \
                  *) \
                    $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(libdir); \
                esac; \