[m-rev.] diff: fix `.mih' installation for default grade

[Simon Taylor]

Estimated hours taken: 0.25
Branches: main

Fix a bug in my change to generate grade dependent header files.
The `.mih' files weren't being installed for the default grade.

scripts/Mmake.rules:
	Run `lib<main_module>.install_grade_hdrs' for
	all grades, including the default grade.

Mmakefile:
library/Mmakefile:
	libmer_std.install_grade_hdrs is now run by
	libmer_std.install_library, so it doesn't
	need to be explicitly invoked here.

Index: Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/Mmakefile,v
retrieving revision 1.78
diff -u -u -r1.78 Mmakefile
--- Mmakefile	30 May 2002 12:54:51 -0000	1.78
+++ Mmakefile	31 May 2002 04:46:18 -0000
@@ -432,7 +432,6 @@
 		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade install_lib ) && \
 		( cd library && \
 		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade depend && \
-		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade install_grade_hdrs && \
 		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade install_library ) && \
 		( cd browser && \
 		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade depend && \
Index: library/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/library/Mmakefile,v
retrieving revision 1.91
diff -u -u -r1.91 Mmakefile
--- library/Mmakefile	30 May 2002 12:55:21 -0000	1.91
+++ library/Mmakefile	31 May 2002 04:48:39 -0000
@@ -336,9 +336,6 @@
 .PHONY: install_hdrs
 install_hdrs: lib$(STD_LIB_NAME).install_hdrs
 
-.PHONY: install_grade_hdrs
-install_grade_hdrs: lib$(STD_LIB_NAME).install_grade_hdrs
-
 .PHONY: install_init
 install_init: $(STD_LIB_NAME).init install_lib_dirs
 	cp `vpath_find $(STD_LIB_NAME).init` $(INSTALL_MODULE_DIR)
@@ -405,11 +402,6 @@
 
 .PHONY: install_hdrs
 install_hdrs:
-	echo "Can't do make install without LIBRARY_INTERMODULE=yes"
-	exit 1
-
-.PHONY: install_grade_hdrs
-install_grade_hdrs:
 	echo "Can't do make install without LIBRARY_INTERMODULE=yes"
 	exit 1
 
Index: scripts/Mmake.rules
===================================================================
RCS file: /home/mercury1/repository/mercury/scripts/Mmake.rules,v
retrieving revision 1.123
diff -u -u -r1.123 Mmake.rules
--- scripts/Mmake.rules	30 May 2002 12:55:22 -0000	1.123
+++ scripts/Mmake.rules	31 May 2002 04:45:28 -0000
@@ -479,7 +479,8 @@
 	$(INSTALL) `vpath_find $*.init` $(INSTALL_MODULE_DIR)
 
 .PHONY: lib%.install_library
-lib%.install_library: lib%.a lib%.$(EXT_FOR_SHARED_LIB) install_grade_dirs
+lib%.install_library: lib%.a lib%.$(EXT_FOR_SHARED_LIB) \
+			install_grade_dirs lib%.install_grade_hdrs
 	$(INSTALL) `vpath_find lib$*.a lib$*.$(EXT_FOR_SHARED_LIB)` \
 			$(INSTALL_MERC_LIB_DIR)
 
@@ -494,8 +495,6 @@
 	for grade in x $(ALL_LIBGRADES); do \
 		if [ "$$grade" != "x" ]; then \
 			$(MMAKE) GRADE=$$grade $*.depend || \
-				exit 1; \
-			$(MMAKE) GRADE=$$grade lib$*.install_grade_hdrs || \
 				exit 1; \
 			$(MMAKE) GRADE=$$grade lib$*.install_library || \
 				exit 1; \
--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------