Changeset 933


Ignore:
Timestamp:
Nov 15, 2006, 6:30:04 PM (13 years ago)
Author:
bruno
Message:

Fix a rpm build issue on x86_64

Location:
branches/stable/mindi
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mindi/distributions/rpm/mindi.spec

    r846 r933  
    3838export PREFIX=${RPM_BUILD_ROOT}%{_exec_prefix}
    3939export CONFDIR=${RPM_BUILD_ROOT}%{_sysconfdir}
     40export MANDIR=${RPM_BUILD_ROOT}%{_mandir}
     41export LIBDIR=${RPM_BUILD_ROOT}%{_libdir}
     42export DOCDIR=${RPM_BUILD_ROOT}%{_docdir}
    4043export RPMBUILDMINDI="true"
    4144
  • branches/stable/mindi/install.sh

    r916 r933  
    3434echo "mindi ${MINDIVER}-r${MINDIREV} will be installed under $local"
    3535
    36 DOCDIR=$local/share/doc/mindi-$MINDIVER
    37 MANDIR=$local/share/man/man8
    38 
    39 ARCH=`/bin/arch`
    40 echo $ARCH | grep -E '^i[0-9]86$' &> /dev/null && ARCH=i386 && locallib=$local/lib
    41 echo $ARCH | grep -E '^x86_64$' &> /dev/null && locallib=$local/lib64
    42 echo $ARCH | grep -E '^ia64$' &> /dev/null && locallib=$local/lib
    43 export ARCH
     36if [ _"$MANDIR" == _"" ]; then
     37    MANDIR=$local/share/man/man8
     38else
     39    MANDIR=$MANDIR/man8
     40fi
     41if [ _"$DOCDIR" == _"" ]; then
     42    DOCDIR=$local/share/doc/mindi-$MINDIVER
     43else
     44    DOCDIR=$DOCDIR/mindi-$MINDIVER
     45fi
     46if [ _"$LIBDIR" == _"" ]; then
     47    locallib=$LIBDIR
     48else
     49    ARCH=`/bin/arch`
     50    echo $ARCH | grep -E '^i[0-9]86$' &> /dev/null && ARCH=i386 && locallib=$local/lib
     51    echo $ARCH | grep -E '^x86_64$' &> /dev/null && locallib=$local/lib64
     52    echo $ARCH | grep -E '^ia64$' &> /dev/null && locallib=$local/lib
     53    export ARCH
     54fi
    4455
    4556echo "Creating target directories ..."
Note: See TracChangeset for help on using the changeset viewer.