Changeset 936 in MondoRescue for branches/stable/mindi/distributions


Ignore:
Timestamp:
Nov 16, 2006, 2:17:27 AM (17 years ago)
Author:
Bruno Cornec
Message:

Try to fix issues on x86_64 for rpm based distro. Still need work for debian and gentoo

Location:
branches/stable/mindi/distributions
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/stable/mindi/distributions/debian/rules

    r807 r936  
    2626    dh_installdirs
    2727    # Build the installation tree:
    28     ( export RPMBUILDMINDI=true && export PREFIX=$(CURDIR)/debian/$(PACKAGE_NAME)/usr && export CONFDIR=$(CURDIR)/debian/$(PACKAGE_NAME)/etc && ./install.sh )
     28    ( export RPMBUILDMINDI=true && export HEAD=$(CURDIR)/debian/$(PACKAGE_NAME) && export PREFIX=/usr && export CONFDIR=/etc && export MANDIR=$(PREFIX)/share/man && && export LIBDIR=$(PREFIX)/lib && export DOCDIR=$(PREFIX)/share/doc && ./install.sh )
    2929
    3030# Build architecture-independent files here.

  • branches/stable/mindi/distributions/gentoo/mindi.ebuild

    r781 r936  
    2626
    2727src_install() {
    28     export PREFIX="${D}/usr"
    29     export CONFDIR="${D}/etc"
     28    export HEAD="${D}"
     29    export PREFIX="/usr"
     30    export CONFDIR="/etc"
     31    export MANDIR="${PREFIX}/share/man"
     32    export DOCDIR="${PREFIX}/share/doc"
     33    export LIBDIR="${PREFIX}/lib"
    3034    export DONT_RELINK=1
    3135    export RPMBUILDMINDI="true"

  • branches/stable/mindi/distributions/rpm/mindi.spec

    r933 r936  
    3636export DONT_RELINK=1
    3737
    38 export PREFIX=${RPM_BUILD_ROOT}%{_exec_prefix}
    39 export CONFDIR=${RPM_BUILD_ROOT}%{_sysconfdir}
    40 export MANDIR=${RPM_BUILD_ROOT}%{_mandir}
    41 export LIBDIR=${RPM_BUILD_ROOT}%{_libdir}
    42 export DOCDIR=${RPM_BUILD_ROOT}%{_docdir}
     38export HEAD=${RPM_BUILD_ROOT}
     39export PREFIX=%{_exec_prefix}
     40# Bug on x86_64 on _sysconfdir on rhel4 at least
     41%ifarch x86_64
     42export CONFDIR=/etc
     43%else
     44export CONFDIR=%{_sysconfdir}
     45%endif
     46export MANDIR=%{_mandir}
     47export DOCDIR=%{_docdir}
     48export LIBDIR=%{_libdir}
    4349export RPMBUILDMINDI="true"
    4450
    … …  
    4753%clean
    4854%{__rm} -rf $RPM_BUILD_ROOT
    49 
    50 %post
    51 if [ -f /usr/local/sbin/mindi ]; then
    52     echo "WARNING: /usr/local/sbin/mindi exists. You should probably remove your manual mindi installation !"
    53 fi
    5455
    5556%files
Note: See TracChangeset for help on using the changeset viewer.