Spec write the right prefix in alc_env.* scripts.
alliance-run corrected variables for a /usr installation.
This commit is contained in:
parent
62daa586f3
commit
830798cce8
|
@ -138,10 +138,6 @@ pushd documentation/tutorials
|
|||
popd
|
||||
# ------------------------------------------------------------------------------
|
||||
|
||||
# fixing flex and bison update on rawhide
|
||||
#sed -i '30i\#include \"string.h\"' ocp/src/placer/Ocp.cpp ocp/src/placer/PPlacement.h
|
||||
#sed -i '18i\#include \"bvl_bcomp_y.h\"' bvl/src/bvl_bcomp_y.y
|
||||
|
||||
# make sure the man pages are UTF-8...
|
||||
for nonUTF8 in FAQ README LICENCE distrib/doc/alc_origin.1 alcban/man1/alcbanner.1 \
|
||||
loon/doc/loon.1 m2e/doc/man1/m2e.1 boog/doc/boog.1 ; do
|
||||
|
@ -173,6 +169,7 @@ find documentation/tutorials/ \
|
|||
|
||||
export ALLIANCE_TOP=%{prefix}
|
||||
|
||||
# must run autotools before it does itself and fail
|
||||
aclocal -I .
|
||||
libtoolize --force --copy
|
||||
automake --add-missing --foreign
|
||||
|
@ -208,8 +205,8 @@ sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
|
|||
pushd %{buildroot}%{_sysconfdir}/profile.d
|
||||
chmod 0644 alc_env.*
|
||||
sed -i "s|@DATE@|`date`|" alc_env*
|
||||
sed "s|ALLIANCE_TOP *= *\([^;]*\)|ALLIANCE_TOP=%{prefix}|" alc_env.sh
|
||||
sed "s|setenv *ALLIANCE_TOP *\([^;]*\)|setenv ALLIANCE_TOP %{prefix}|" alc_env.csh
|
||||
sed "s|ALLIANCE_TOP *= *\([^;]*\)|ALLIANCE_TOP=%{_prefix}|" alc_env.sh
|
||||
sed "s|setenv *ALLIANCE_TOP *\([^;]*\)|setenv ALLIANCE_TOP %{_prefix}|" alc_env.csh
|
||||
popd
|
||||
|
||||
|
||||
|
@ -236,8 +233,7 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
|
|||
|
||||
# Adding icons for the menus
|
||||
%{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
|
||||
%{__cp} -p distrib/*.png \
|
||||
%{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
|
||||
%{__cp} -p distrib/*.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
|
||||
|
||||
|
||||
# desktop files with enhanced menu from electronics-menu now on Fedora
|
||||
|
@ -250,7 +246,9 @@ done
|
|||
|
||||
|
||||
# Architecture independent files
|
||||
%{__mv} %{buildroot}%{prefix}/bin %{buildroot}%{_bindir}
|
||||
%{__mkdir} -p %{buildroot}%{_sysconfdir}/%{name}
|
||||
%{__mkdir} -p %{buildroot}%{_bindir}
|
||||
%{__mv} %{buildroot}%{prefix}/bin/* %{buildroot}%{_bindir}
|
||||
%{__mv} %{buildroot}%{prefix}/cells %{buildroot}%{_datadir}/%{name}/
|
||||
%{__mv} %{buildroot}%{prefix}%{_sysconfdir}/* %{buildroot}%{_sysconfdir}/%{name}
|
||||
rmdir %{buildroot}%{prefix}%{_sysconfdir}
|
||||
|
|
|
@ -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.10 2011/02/06 14:37:33 jpc Exp $
|
||||
# $Id: alc_env.sh.in,v 1.11 2011/02/10 11:33:46 jpc Exp $
|
||||
# Generated from alc_env.sh.in on @DATE@
|
||||
|
||||
# $ALLIANCE_OS and $ALLIANCE_TOP are the only variables you will
|
||||
|
@ -98,4 +98,4 @@
|
|||
fi
|
||||
|
||||
# fixing *** ERROR *** : Variable MBK_SPI_MODEL not found.
|
||||
MBK_SPI_MODEL=$ALLIANCE_TOP/etc/spimodel.cfg; export MBK_SPI_MODEL
|
||||
MBK_SPI_MODEL=$SYSCONF_TOP/spimodel.cfg; export MBK_SPI_MODEL
|
||||
|
|
|
@ -12,7 +12,9 @@
|
|||
STANDART_PATH = PATH=$(STANDART_BIN); export PATH
|
||||
|
||||
# Standart Alliance binary access paths.
|
||||
ALLIANCE_BIN = $(ALLIANCE_TOP)/bin
|
||||
ALLIANCE_BIN = /usr/bin
|
||||
SYSCONF_TOP = /etc/alliance
|
||||
CELLS_TOP = /usr/share/alliance/cells
|
||||
|
||||
ALLIANCE_EXAMPLES = /usr/share/doc/alliance-doc-5.0/alliance-examples
|
||||
|
||||
|
@ -37,13 +39,13 @@ ALLIANCE_EXAMPLES=/usr/share/doc/alliance-doc-5.0/alliance-examples
|
|||
EXTRACT_PH = ap
|
||||
GENERAT_SP = .
|
||||
EXTRACT_SP = .
|
||||
CATA_LIB0 = $(ALLIANCE_TOP)/cells/sxlib
|
||||
CATA_LIB1 = $(ALLIANCE_TOP)/cells/dp_sxlib
|
||||
CATA_LIB2 = $(ALLIANCE_TOP)/cells/padlib
|
||||
CATA_LIB0 = $(CELLS_TOP)/sxlib
|
||||
CATA_LIB1 = $(CELLS_TOP)/dp_sxlib
|
||||
CATA_LIB2 = $(CELLS_TOP)/padlib
|
||||
CATA_LIB = .:$(CATA_LIB0):$(CATA_LIB1):$(CATA_LIB2)
|
||||
TARGET_LIB = $(MBK_TARGET_LIB)
|
||||
RDS_TECHNO = $(ALLIANCE_TOP)/etc/cmos.rds
|
||||
GRAAL_TECHNO = $(ALLIANCE_TOP)/etc/cmos.graal
|
||||
TARGET_LIB = $(CATA_LIB0)
|
||||
RDS_TECHNO = $(SYSCONF_TOP)/cmos.rds
|
||||
GRAAL_TECHNO = $(SYSCONF_TOP)/cmos.graal
|
||||
|
||||
|
||||
MBK_GENERAT_ENV = MBK_TARGET_LIB=$(TARGET_LIB); export MBK_TARGET_LIB; \
|
||||
|
@ -80,9 +82,9 @@ ALLIANCE_EXAMPLES=/usr/share/doc/alliance-doc-5.0/alliance-examples
|
|||
# --------------------------------------------------------------------
|
||||
# Alliance binaries & environment.
|
||||
|
||||
BOOM = $(ALLIANCE_BIN)/boom -V
|
||||
BOOG = $(ALLIANCE_BIN)/boog
|
||||
LOON = $(ALLIANCE_BIN)/loon
|
||||
BOOM = $(MBK_GENERAT_ENV); $(ALLIANCE_BIN)/boom -V
|
||||
BOOG = $(MBK_GENERAT_ENV); $(ALLIANCE_BIN)/boog
|
||||
LOON = $(MBK_GENERAT_ENV); $(ALLIANCE_BIN)/loon
|
||||
ASIMUT1 = $(MBK_GENERAT_ENV); $(ALLIANCE_BIN)/asimut
|
||||
ASIMUT2 = $(MBK_EXTRACT_ENV); $(ALLIANCE_BIN)/asimut
|
||||
COUGAR = $(ALLIANCE_BIN)/cougar
|
||||
|
|
Loading…
Reference in New Issue