]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
icecream: Fix build on x86_64.
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 2 Mar 2012 22:50:56 +0000 (23:50 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 2 Mar 2012 22:50:56 +0000 (23:50 +0100)
icecream/icecream.nm

index d41e4e0ec716692c2cb75cf359db14a7d6cfafd0..9c63e61c5101919011915e3e81a51bffd6dcf407 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = icecream
 version    = 0.9.7
-release    = 2
+release    = 3
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = Development/Compilers
@@ -47,17 +47,15 @@ build
        end
 
        install_cmds
-               ICECREAM_TARGET_PLATFORM=$(echo %{DISTRO_MACHINE} | sed -e "s/-gnu//g")
-
-               mkdir -pv %{BUILDROOT}/usr/lib/icecc/bin
+               mkdir -pv %{BUILDROOT}%{libdir}/icecc/bin
                for i in gcc g++ cc c++; do
-                       ln -svf ../../../bin/icecc %{BUILDROOT}/usr/lib/icecc/bin/${i}
-                       ln -svf ../../../bin/icecc %{BUILDROOT}/usr/lib/icecc/bin/%{ICECREAM_TARGET_PLATFORM}-${i}
+                       ln -svf ../../../bin/icecc %{BUILDROOT}%{libdir}/icecc/bin/${i}
+                       ln -svf ../../../bin/icecc %{BUILDROOT}%{libdir}/icecc/bin/%{DISTRO_BUILDTARGET}-${i}
                done
-               sed -e 's|^#!.*|#!/bin/bash|' -i %{BUILDROOT}/usr/lib/icecc/icecc-create-env
+               sed -e 's|^#!.*|#!/bin/bash|' -i %{BUILDROOT}%{libdir}/icecc/icecc-create-env
 
                mkdir -pv %{BUILDROOT}/etc/profile.d
-               sed -e "s|@LIBDIR@|/usr/lib|g" \
+               sed -e "s|@LIBDIR@|%{libdir}|g" \
                        < %{DIR_SOURCE}/icecream.sh > %{BUILDROOT}/etc/profile.d/icecream.sh
 
                # create default working dir