[m-rev.] trivial diff: fix ranlib flags in Mmakefiles

[Julien Fischer]

Estimated hours taken: 0.2
Branches: main, release

boehm_gc/Mmakefile:
runtime/Mmakefile:
trace/Mmakefile:
 	Confrom to the recent change in the handling of ranlib flags.

Julien.

(This diff is against the 0.13 branch.)
Index: boehm_gc/Mmakefile
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/boehm_gc/Mmakefile,v
retrieving revision 1.28
diff -u -r1.28 Mmakefile
--- boehm_gc/Mmakefile	19 Oct 2004 06:01:36 -0000	1.28
+++ boehm_gc/Mmakefile	14 Nov 2006 13:57:33 -0000
@@ -169,7 +169,7 @@
  install_lib: lib$(GC_GRADE).$A lib$(GC_GRADE).$(EXT_FOR_SHARED_LIB) install_dirs
  	cp `vpath_find lib$(GC_GRADE).$A lib$(GC_GRADE).$(EXT_FOR_SHARED_LIB)` \
  		$(INSTALL_MERC_GC_LIB_DIR)
-	$(RANLIB) $(INSTALL_MERC_GC_LIB_DIR)/lib$(GC_GRADE).$A
+	$(RANLIB) $(RANLIBFLAGS) $(INSTALL_MERC_GC_LIB_DIR)/lib$(GC_GRADE).$A

  .PHONY: install_dll
  install_dll:
Index: runtime/Mmakefile
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/runtime/Mmakefile,v
retrieving revision 1.132
diff -u -r1.132 Mmakefile
--- runtime/Mmakefile	30 Mar 2006 06:13:48 -0000	1.132
+++ runtime/Mmakefile	14 Nov 2006 13:58:14 -0000
@@ -365,7 +365,7 @@
  	rm -f lib$(RT_LIB_NAME)$(DLL_DEF_LIB).$A
  	$(AR) $(ALL_ARFLAGS) \
  		$(AR_LIBFILE_OPT)lib$(RT_LIB_NAME)$(DLL_DEF_LIB).$A $(OBJS)
-	$(RANLIB) lib$(RT_LIB_NAME)$(DLL_DEF_LIB).$A
+	$(RANLIB) $(RANLIBFLAGS) lib$(RT_LIB_NAME)$(DLL_DEF_LIB).$A

  lib$(RT_LIB_NAME).so: $(PIC_OBJS)
  	$(LINK_SHARED_OBJ) $(ERROR_UNDEFINED)				\
@@ -498,7 +498,7 @@
  	cp `vpath_find lib$(RT_LIB_NAME).$A \
  		lib$(RT_LIB_NAME).$(EXT_FOR_SHARED_LIB)` \
  		$(INSTALL_MERC_LIB_DIR)
-	$(RANLIB) $(INSTALL_MERC_LIB_DIR)/lib$(RT_LIB_NAME).$A
+	$(RANLIB) $(RANLIBFLAGS) $(INSTALL_MERC_LIB_DIR)/lib$(RT_LIB_NAME).$A

  endif
  endif
Index: trace/Mmakefile
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/trace/Mmakefile,v
retrieving revision 1.44.2.1
diff -u -r1.44.2.1 Mmakefile
--- trace/Mmakefile	4 Apr 2006 07:42:03 -0000	1.44.2.1
+++ trace/Mmakefile	14 Nov 2006 13:59:37 -0000
@@ -173,7 +173,7 @@
  	rm -f lib$(TRACE_LIB_NAME)$(DLL_DEF_LIB).$A
  	$(AR) $(ALL_ARFLAGS) \
  		$(AR_LIBFILE_OPT)lib$(TRACE_LIB_NAME)$(DLL_DEF_LIB).$A $(OBJS)
-	$(RANLIB) lib$(TRACE_LIB_NAME)$(DLL_DEF_LIB).$A
+	$(RANLIB) $(RANLIBFLAGS) lib$(TRACE_LIB_NAME)$(DLL_DEF_LIB).$A

  RPATH_1=$(SHLIB_RPATH_OPT)$(FINAL_INSTALL_MERC_LIB_DIR)
  RPATH_2=$(SHLIB_RPATH_SEP)$(FINAL_INSTALL_MERC_GC_LIB_DIR)
@@ -233,7 +233,8 @@
  	cp `vpath_find lib$(TRACE_LIB_NAME).$A \
  		lib$(TRACE_LIB_NAME).$(EXT_FOR_SHARED_LIB)` \
  		$(INSTALL_MERC_LIB_DIR)
-	$(RANLIB) $(INSTALL_MERC_LIB_DIR)/lib$(TRACE_LIB_NAME).$A
+	$(RANLIB) $(RANLIBFLAGS) \
+		$(INSTALL_MERC_LIB_DIR)/lib$(TRACE_LIB_NAME).$A

  endif


--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to:       mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions:          mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------