[m-rev.] diff: fix bug in user library installation
Simon Taylor
stayl at cs.mu.OZ.AU
Wed Aug 15 02:49:19 AEST 2001
Estimated hours taken: 0.5
Branches: main
scripts/Mmake.rules:
Fix a bug in my change to add timestamps for `.c' files
which broke installation of user libraries. Move the `.c_date'
file into the temporary directory with the `.c' file while
building the library to install in all the different grades.
Index: Mmake.rules
===================================================================
RCS file: /home/mercury1/repository/mercury/scripts/Mmake.rules,v
retrieving revision 1.110
diff -u -u -r1.110 Mmake.rules
--- Mmake.rules 2001/08/14 08:19:31 1.110
+++ Mmake.rules 2001/08/14 16:47:57
@@ -470,8 +470,8 @@
lib%.install_grades:
rm -rf tmp_dir && \
mkdir tmp_dir && \
- { mv -f $(deps_subdir)$*.dep $($*.hs) $($*.cs) $($*.os) $($*.pic_os) \
- *.a *.so tmp_dir || true; } && \
+ { mv -f $(deps_subdir)$*.dep $($*.hs) $($*.cs) $($*.c_dates) $($*.os) \
+ $($*.pic_os) *.a *.so tmp_dir || true; } && \
for grade in x $(ALL_LIBGRADES); do \
if [ "$$grade" != "x" ]; then \
$(MMAKE) GRADE=$$grade $*.depend || \
@@ -480,12 +480,13 @@
exit 1; \
$(MMAKE) GRADE=$$grade lib$*.install_library || \
exit 1; \
- rm -f $(deps_subdir)$*.dep $($*.hs) $($*.cs) $($*.os) \
- $($*.pic_os) *.a *.so; \
+ rm -f $(deps_subdir)$*.dep $($*.hs) $($*.cs) \
+ $($*.c_dates) $($*.os) $($*.pic_os) *.a *.so; \
fi; \
done && \
{ mv tmp_dir/*.c $(cs_subdir). ; \
mv tmp_dir/*.$O $(os_subdir). ; \
+ mv tmp_dir/*.c_date $(c_dates_subdir). ; \
mv tmp_dir/*.pic_o $(os_subdir). ; \
mv tmp_dir/*.dep $(deps_subdir). ; \
mv tmp_dir/* . ; rmdir tmp_dir ; true; }
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------
More information about the reviews
mailing list