aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2007-01-28 16:49:07 -0800
committerH. Peter Anvin <hpa@zytor.com>2007-01-28 16:49:07 -0800
commit1f7382b2e789b30992f935c471ef154b63cf5b83 (patch)
tree819959a2d84de23aac326e3c82b03047d4d49acd
parente8867319d9a1336eed644f7ac9438bf6a89ba762 (diff)
downloadsyslinux.git-1f7382b2e789b30992f935c471ef154b63cf5b83.tar.gz
syslinux.git-1f7382b2e789b30992f935c471ef154b63cf5b83.tar.xz
syslinux.git-1f7382b2e789b30992f935c471ef154b63cf5b83.zip
Apparently rpmbuild won't accept a macro named "cc" either. Morons.
-rw-r--r--syslinux.spec.in14
1 files changed, 7 insertions, 7 deletions
diff --git a/syslinux.spec.in b/syslinux.spec.in
index 0559c009..115a6f20 100644
--- a/syslinux.spec.in
+++ b/syslinux.spec.in
@@ -15,10 +15,10 @@ BuildPrereq: nasm >= 0.98.38, perl
Autoreq: 0
%ifarch x86_64
Requires: mtools, libc.so.6()(64bit)
-%define cc gcc
+%define my_cc gcc
%else
Requires: mtools, libc.so.6
-%define cc gcc -m32
+%define my_cc gcc -m32
%endif
# NOTE: extlinux belongs in /sbin, not in /usr/sbin, since it is typically
@@ -63,9 +63,9 @@ booting in the /tftpboot directory.
%setup -q -n syslinux-%{VERSION}
%build
-make CC='%{cc}' clean
-make CC='%{cc}' installer
-make CC='%{cc}' -C sample tidy
+make CC='%{my_cc}' clean
+make CC='%{my_cc}' installer
+make CC='%{my_cc}' -C sample tidy
%install
rm -rf %{buildroot}
@@ -74,10 +74,10 @@ mkdir -p %{buildroot}%{_sbindir}
mkdir -p %{buildroot}%{_datadir}/syslinux
mkdir -p %{buildroot}%{_includedir}
mkdir -p %{buildroot}/boot %{buildroot}/tftpboot/pxelinux.cfg
-make CC='%{cc}' install-all \
+make CC='%{my_cc}' install-all \
INSTALLROOT=%{buildroot} BINDIR=%{_bindir} SBINDIR=%{_sbindir} \
LIBDIR=%{_datadir} INCDIR=%{_includedir}
-make CC='%{cc}' -C sample tidy
+make CC='%{my_cc}' -C sample tidy
cp mkdiskimage sys2ansi.pl keytab-lilo.pl %{buildroot}%{_datadir}/syslinux
cp %{buildroot}%{_datadir}/syslinux/*.c32 %{buildroot}/boot
cp %{buildroot}%{_datadir}/syslinux/memdisk %{buildroot}/boot