From 511287a0ed0ce19f409a51faf55cfb3a7ec96752 Mon Sep 17 00:00:00 2001 From: Olivier Sirol Date: Fri, 28 Jun 2002 10:36:09 +0000 Subject: [PATCH] *** empty log message *** --- alliance/src/distrib/mkdistrib | 10 +++++----- alliance/src/distrib/myspec | 15 +++++---------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/alliance/src/distrib/mkdistrib b/alliance/src/distrib/mkdistrib index e94f158e..f2b7229a 100755 --- a/alliance/src/distrib/mkdistrib +++ b/alliance/src/distrib/mkdistrib @@ -4,11 +4,11 @@ # Copyright (C) 1999, 2000 Czo # License: GPL (http://www.gnu.org/copyleft/gpl.html) # Started: April 2000 -# Last Change: Wednesday 26 June 2002, 17:40 -# Edit Time: 206:39:27 +# Last Change: Friday 28 June 2002, 12:35 +# Edit Time: 206:48:44 # Description: # -# $Id: mkdistrib,v 1.5 2002/06/26 15:41:13 czo Exp $ +# $Id: mkdistrib,v 1.6 2002/06/28 10:36:09 czo Exp $ # ################################################################### @@ -175,11 +175,11 @@ done try mv $ALC_PACK-bip.tar.gz $ALC_PACK-i386-linux-2.4.9.tar.gz try mv $ALC_PACK-beny.tar.gz $ALC_PACK-sparc-solaris-2.7.tar.gz -try rpm -ta $ALC_PACK-i386-linux-2.4.9.tar.gz - try cp -f "$ALC_PACK.tar.gz" $ALC_FTPDISTRIBDIR try cp -f "$ALC_PACK-i386-linux-2.4.9.tar.gz" $ALC_FTPDISTRIBDIR try cp -f "$ALC_PACK-sparc-solaris-2.7.tar.gz" $ALC_FTPDISTRIBDIR + +try rpm -ta $ALC_PACK.tar.gz try cp -f "/dsk/l1/tmp/czo/rpm/RPMS/$ALC_PACK.rpm" $ALC_FTPDISTRIBDIR diff --git a/alliance/src/distrib/myspec b/alliance/src/distrib/myspec index 08ac08fe..44cbc99c 100644 --- a/alliance/src/distrib/myspec +++ b/alliance/src/distrib/myspec @@ -4,7 +4,7 @@ # rpm -ba /var/tmp/czo/rpm/SPECS/alliance.spec # avec $HOME/.rpmmacros : # %_topdir /var/tmp/czo/rpm -# $Id: myspec,v 1.1 2002/06/25 14:09:38 czo Exp $ +# $Id: myspec,v 1.2 2002/06/28 10:36:09 czo Exp $ %define name alliance %define prefix /usr/local/alliance @@ -45,16 +45,11 @@ microprocessor and 400 000 transistors IEEE Gigabit HSL Router. # As we use libraries for tools that we build in the same run, we have to # do the "install" step within the "build" step. - export CPPFLAGS="-I%{buildroot}%{prefix}/include" - export LIBS="-L%{buildroot}%{prefix}/lib" - export ALLIANCE_TOP=%{prefix} +ALLIANCE_TOP=%{buildroot}/%{prefix} +export ALLIANCE_TOP - mkdir %{_os} - cd %{_os} - ../configure --prefix=%{prefix} - make DESTDIR=%{buildroot} install - cd .. - rm -r %{_os} +./configure --prefix=%{prefix} +make DESTDIR=%{buildroot} install %post ln -sf %{prefix}/etc/alc_env.sh /etc/profile.d