[m-rev.] diff: update RPM spec file

Fergus Henderson fjh at cs.mu.OZ.AU
Sun Feb 8 15:27:29 AEDT 2004


Estimated hours taken: 4
Branches: main

Update the RPM spec file to support RedHat 8.0 and Mercury > 0.11.

.mercury-compiler.spec.in:
    - use /usr/share/man and /usr/share/info instead of /usr/man and /usr/info;
    - use ".1*" instead of ".1" for man pages in order to allow for the
        possibility of them being compressed;
    - set INSTALL_PREFIX when doing make install;
    - set MERCURY_COMPILER when doing make install,
        in order to allow installing from the source .tar.gz without
	needing an already-installed Mercury compiler;
    - mention new files added since Mercury 0.10.

Workspace: /home/jupiter/fjh/ws-jupiter/mercury
Index: .mercury-compiler.spec.in
===================================================================
RCS file: /home/mercury1/repository/mercury/.mercury-compiler.spec.in,v
retrieving revision 1.4
diff -u -d -r1.4 .mercury-compiler.spec.in
--- .mercury-compiler.spec.in	16 Oct 2002 17:09:48 -0000	1.4
+++ .mercury-compiler.spec.in	8 Feb 2004 04:25:24 -0000
@@ -35,6 +35,18 @@
 from <http://www.cs.mu.oz.au/mercury/download/release.html>.
 
 %changelog
+* Sun Feb  8 2004 Fergus Henderson <fjh at cs.mu.oz.au>
+- Update to support RedHat 8.0 and Mercury > 0.11.
+  In particular:
+    use /usr/share/man and /usr/share/info instead of /usr/man and /usr/info;
+    use ".1*" instead of ".1" for man pages in order to allow for the
+        possibility of them being compressed;
+    set INSTALL_PREFIX when doing make install;
+    set MERCURY_COMPILER when doing make install,
+        in order to allow installing from the source .tar.gz without
+	needing an already-installed Mercury compiler;
+    mention new files added since Mercury 0.10.
+
 * Thu Oct 16 2002 Fergus Henderson <fjh at cs.mu.oz.au>
 - Modify the way the spec file is generated to support building
   RPMS for ROTD releases.
@@ -54,7 +66,12 @@
 make
 
 %install
-make install
+PLATFORM=`./config.guess`
+MERCURY_COMPILER=$RPM_BUILD_ROOT%{_libdir}/mercury/bin/$PLATFORM/mercury_compile \
+make install \
+    INSTALL_PREFIX=$RPM_BUILD_ROOT%{_prefix} \
+    INSTALL_MAN_DIR=$RPM_BUILD_ROOT%{_mandir} \
+    INSTALL_INFO_DIR=$RPM_BUILD_ROOT%{_infodir}
 
 %files
 %doc README* 
@@ -63,9 +80,13 @@
 %doc COPYING COPYING.LIB
 %doc samples
 /usr/bin/c2init
+/usr/bin/canonical_grade
+/usr/bin/info_to_mdb
 /usr/bin/mdb
 /usr/bin/mdemangle
+/usr/bin/mercury.bat
 /usr/bin/mercury_cleanup_install
+/usr/bin/mercury_config
 /usr/bin/mercury_update_interface
 /usr/bin/mgnuc
 /usr/bin/mkfifo_using_mknod
@@ -77,19 +98,20 @@
 /usr/bin/mprof_merge_runs
 /usr/bin/mtags
 /usr/bin/vpath_find
-/usr/man/man1/c2init.1
-/usr/man/man1/mdb.1
-/usr/man/man1/mgnuc.1
-/usr/man/man1/ml.1
-/usr/man/man1/mmake.1
-/usr/man/man1/mmc.1
-/usr/man/man1/mprof.1
-/usr/man/man1/mprof_merge_runs.1
-/usr/man/man1/mtags.1
-/usr/info/mercury.info
-/usr/info/mercury_faq.info*
-/usr/info/mercury_library.info*
-/usr/info/mercury_ref.info*
-/usr/info/mercury_trans_guide.info*
-/usr/info/mercury_user_guide.info*
+/usr/share/man/man1/c2init.1*
+/usr/share/man/man1/mdb.1*
+/usr/share/man/man1/mercury_config.1*
+/usr/share/man/man1/mgnuc.1*
+/usr/share/man/man1/ml.1*
+/usr/share/man/man1/mmake.1*
+/usr/share/man/man1/mmc.1*
+/usr/share/man/man1/mprof.1*
+/usr/share/man/man1/mprof_merge_runs.1*
+/usr/share/man/man1/mtags.1*
+/usr/share/info/mercury.info*
+/usr/share/info/mercury_faq.info*
+/usr/share/info/mercury_library.info*
+/usr/share/info/mercury_ref.info*
+/usr/share/info/mercury_trans_guide.info*
+/usr/share/info/mercury_user_guide.info*
 /usr/lib/mercury

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
The University of Melbourne         |  of excellence is a lethal habit"
WWW: <http://www.cs.mu.oz.au/~fjh>  |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
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