Move the register-inplace special-case stuff into the ghc-prim package

[ghc-hetmet.git] / libraries / Makefile

diff --git a/libraries/Makefile b/libraries/Makefile
index 20a039c..6a38e3d 100644 (file)
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -303,7 +303,7 @@ make.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
          setup/Setup makefile -f GNUmakefile; \
          cmp -s GNUmakefile GNUmakefile.tmp && mv GNUmakefile.tmp GNUmakefile; \
          $(MAKE) $(MFLAGS) && \
          setup/Setup makefile -f GNUmakefile; \
          cmp -s GNUmakefile GNUmakefile.tmp && mv GNUmakefile.tmp GNUmakefile; \
          $(MAKE) $(MFLAGS) && \

-         ../installPackage/installPackage register --inplace; \
+         setup/Setup register --inplace; \

        fi
 
 # Hack for ndp, as described above
        fi
 
 # Hack for ndp, as described above

@@ -316,7 +316,7 @@ build.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
        if ifBuildable/ifBuildable $*; then \
          cd $* && \
          setup/Setup build $(addprefix --ghc-option=,$(GhcLibHcOpts)); \
        if ifBuildable/ifBuildable $*; then \
          cd $* && \
          setup/Setup build $(addprefix --ghc-option=,$(GhcLibHcOpts)); \

-         ../installPackage/installPackage register --inplace; \
+         setup/Setup register --inplace; \

        fi
 
 .PHONY: doc html
        fi
 
 .PHONY: doc html