From 43371c07a68b000fc03f9897b9e7fa6caa7dd167 Mon Sep 17 00:00:00 2001
From: Jean-Paul Chaput <Jean-Paul.Chaput@lip6.fr>
Date: Tue, 16 Jul 2002 10:11:21 +0000
Subject: [PATCH]  * distrib/etc/alc_env.sh.in,    distrib/etc/alc_env.csh.in :
    - Ajout des chemins d'acces aux bibliotheques de cellules des       
 generateurs de RAM, ROM et banc de registres.

 * distrib/alliance.spec.in :
   - Passage a "alpha.4".
   - Deplacement des macros m4 d'autoconf dans /usr/share/aclocal.
       Dans le futur, il faudra sans doute retirer motif.m4, parce
       qu'il devrait y en avoir une directement fournie par Motif.
---
 alliance/src/distrib/alliance.spec.in   | 7 ++++++-
 alliance/src/distrib/etc/alc_env.csh.in | 5 ++++-
 alliance/src/distrib/etc/alc_env.sh.in  | 5 ++++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/alliance/src/distrib/alliance.spec.in b/alliance/src/distrib/alliance.spec.in
index b6798bc9..3cc19709 100644
--- a/alliance/src/distrib/alliance.spec.in
+++ b/alliance/src/distrib/alliance.spec.in
@@ -1,7 +1,7 @@
 
 %define       name            alliance
 %define       ver             @VERSION@
-%define       tag             alpha.3
+%define       tag             alpha.4
 %define       release         1.asim.1
 %define       prefix          @prefix@
 
@@ -77,6 +77,11 @@ Sources of the Alliance VLSI CAD System, as you might guess...
  mkdir -p %{buildroot}%{prefix}/src
  tar cf - * | (cd %{buildroot}%{prefix}/src; tar xvf -)
 
+# Copy the Alliance autoconf macros in the right place.
+ mkdir -p %{buildroot}/usr/share/aclocal
+ (cd %{buildroot}%{prefix}/src
+  cp alliance.m4 xpm.m4 motif.m4 %{buildroot}/usr/share/aclocal) 
+
 # Set execution rights on the alc_env.* batchs and adjust ALLIANCE_TOP.
 # This is not clean and has to be moved in the package itself in the
 # future.
diff --git a/alliance/src/distrib/etc/alc_env.csh.in b/alliance/src/distrib/etc/alc_env.csh.in
index bfadf199..47af6afa 100644
--- a/alliance/src/distrib/etc/alc_env.csh.in
+++ b/alliance/src/distrib/etc/alc_env.csh.in
@@ -7,7 +7,7 @@
 #  Alliance CAD system environnement
 #  Usage (in C-shell) : > source alc_env.csh
 #  (C) 1997 Czo  -- <Olivier.Sirol@lip6.fr>
-#  $Id: alc_env.csh.in,v 1.2 2002/05/08 21:07:25 jpc Exp $
+#  $Id: alc_env.csh.in,v 1.3 2002/07/16 10:11:21 jpc Exp $
 #  Generated from alc_env.csh.in on @DATE@
 
 # $ALLIANCE_OS and $ALLIANCE_TOP are the only variables you will
@@ -41,6 +41,9 @@
  
  setenv MBK_CATA_LIB         .:$ALLIANCE_TOP/cells/sxlib
  setenv MBK_CATA_LIB         ${MBK_CATA_LIB}:$ALLIANCE_TOP/cells/dp_sxlib
+ setenv MBK_CATA_LIB         ${MBK_CATA_LIB}:$ALLIANCE_TOP/cells/rflib
+ setenv MBK_CATA_LIB         ${MBK_CATA_LIB}:$ALLIANCE_TOP/cells/romlib
+ setenv MBK_CATA_LIB         ${MBK_CATA_LIB}:$ALLIANCE_TOP/cells/ramlib
  setenv MBK_CATA_LIB         ${MBK_CATA_LIB}:$ALLIANCE_TOP/cells/padlib
  setenv MBK_TARGET_LIB       $ALLIANCE_TOP/cells/sxlib
  setenv MBK_C4_LIB           ./cellsC4 
diff --git a/alliance/src/distrib/etc/alc_env.sh.in b/alliance/src/distrib/etc/alc_env.sh.in
index 2f0565ea..9b7f5c01 100644
--- a/alliance/src/distrib/etc/alc_env.sh.in
+++ b/alliance/src/distrib/etc/alc_env.sh.in
@@ -7,7 +7,7 @@
 #  Alliance CAD system environnement
 #  Usage (in Bourne-shell) : > . alc_env.sh
 #  (C) 1997 Czo  -- <Olivier.Sirol@lip6.fr>
-#  $Id: alc_env.sh.in,v 1.2 2002/05/08 21:07:25 jpc Exp $
+#  $Id: alc_env.sh.in,v 1.3 2002/07/16 10:11:21 jpc Exp $
 #  Generated from alc_env.sh.in on @DATE@
 
 # $ALLIANCE_OS and $ALLIANCE_TOP are the only variables you will
@@ -43,6 +43,9 @@
 
         MBK_CATA_LIB=.:$ALLIANCE_TOP/cells/sxlib
         MBK_CATA_LIB=$MBK_CATA_LIB:$ALLIANCE_TOP/cells/dp_sxlib
+        MBK_CATA_LIB=$MBK_CATA_LIB:$ALLIANCE_TOP/cells/rflib
+        MBK_CATA_LIB=$MBK_CATA_LIB:$ALLIANCE_TOP/cells/ramlib
+        MBK_CATA_LIB=$MBK_CATA_LIB:$ALLIANCE_TOP/cells/romlib
         MBK_CATA_LIB=$MBK_CATA_LIB:$ALLIANCE_TOP/cells/padlib
                                                      export MBK_CATA_LIB