X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Ftarget.mk;h=baaaeb30c4b8d103d8e03ed935fd1e34da0aa2ec;hb=c63aaee42e3e95276861121286eefce511cd1343;hp=206bd8f2cc9c1f7d49306b9ff6b0ca2b2d55a248;hpb=b1a806e77f0fbdd6de6bdf2304ce73a388f0a810;p=ghc-hetmet.git

diff --git a/mk/target.mk b/mk/target.mk
index 206bd8f..baaaeb3 100644
--- a/mk/target.mk
+++ b/mk/target.mk
@@ -72,7 +72,13 @@ include $(TOP)/mk/package.mk
 # Compiler produced files that are targets of the source's imports.
 MKDEPENDHS_OBJ_SUFFICES=o
 
-depend :: $(MKDEPENDHS_SRCS) $(MKDEPENDC_SRCS)
+ifneq "$(STAMP_PKG_CONF)" ""
+PKGCONF_DEP = $(STAMP_PKG_CONF)
+else
+PKGCONF_DEP =
+endif
+
+depend :: $(MKDEPENDHS_SRCS) $(MKDEPENDC_SRCS) $(STAMP_PKG_CONF)
 	@$(RM) .depend
 	@touch .depend
 ifneq "$(DOC_SRCS)" ""
@@ -169,7 +175,7 @@ endif
 # `TAGS'
 #      Update a tags table for this program.
 # 
-# `dvi' `ps' `pdf' `html' `pdf'
+# `dvi' `ps' `pdf' `html' `rtf' 
 #      Generate DVI/PS/PDF files for LaTeX/DocBook docs. Not everything is
 #      supported everywhere, but the intention is to standardise on DocBook
 #      producing all formats.
@@ -296,9 +302,8 @@ SRC_HC_OPTS += -split-objs
 ifeq "$(ArSupportsInput)" ""
 define BUILD_LIB
 $(RM) $@ $@.tmp
-(echo $(STUBOBJS) $(EXTRA_OBJS); $(FIND) $(patsubst %.$(way_)o,%_split,$(HS_OBJS)) -name '*.$(way_)o') | xargs ar q $@.tmp
-$(RANLIB) $@.tmp
-$(MV) $@.tmp $@
+(echo $(STUBOBJS) $(EXTRA_OBJS); $(FIND) $(patsubst %.$(way_)o,%_split,$(HS_OBJS)) -name '*.$(way_)o') | xargs ar q $@
+$(RANLIB) $@
 endef
 else
 define BUILD_LIB
@@ -306,10 +311,9 @@ $(RM) $@ $@.tmp
 echo $(STUBOBJS)    > $@.list
 echo $(EXTRA_OBJS) >> $@.list
 $(FIND) $(patsubst %.$(way_)o,%_split,$(HS_OBJS)) -name '*.$(way_)o' >> $@.list
-$(AR) $(AR_OPTS) $@.tmp $(ArSupportsInput) $@.list
+$(AR) $(AR_OPTS) $@ $(ArSupportsInput) $@.list
 $(RM) $@.list
-$(RANLIB) $@.tmp
-$(MV) $@.tmp $@
+$(RANLIB) $@
 endef
 endif