x86-64 sucks

This commit is contained in:
albert 2003-10-23 03:41:58 +00:00
parent e583724fff
commit 9f62cb1b9d
4 changed files with 17 additions and 4 deletions

View File

@ -30,6 +30,9 @@ ln_f := ln -f
ln_sf := ln -sf ln_sf := ln -sf
install := install -D --owner 0 --group 0 install := install -D --owner 0 --group 0
# Lame x86-64 /lib64 and /usr/lib64 abomination:
lib64 := lib$(shell [ -d /lib64 ] && echo 64)
usr/bin := $(DESTDIR)/usr/bin/ usr/bin := $(DESTDIR)/usr/bin/
bin := $(DESTDIR)/bin/ bin := $(DESTDIR)/bin/
sbin := $(DESTDIR)/sbin/ sbin := $(DESTDIR)/sbin/
@ -39,8 +42,8 @@ man5 := $(DESTDIR)/usr/share/man/man5/
man8 := $(DESTDIR)/usr/share/man/man8/ man8 := $(DESTDIR)/usr/share/man/man8/
etc/X11/applnk/Utilities := $(DESTDIR)/etc/X11/applnk/Utilities/ etc/X11/applnk/Utilities := $(DESTDIR)/etc/X11/applnk/Utilities/
usr/X11R6/bin := $(DESTDIR)/usr/X11R6/bin/ usr/X11R6/bin := $(DESTDIR)/usr/X11R6/bin/
lib := $(DESTDIR)/lib/ lib := $(DESTDIR)/$(lib64)/
usr/lib := $(DESTDIR)/usr/lib/ usr/lib := $(DESTDIR)/usr/$(lib64)/
usr/include := $(DESTDIR)/usr/include/ usr/include := $(DESTDIR)/usr/include/
#SKIP := $(bin)kill $(man1)kill.1 #SKIP := $(bin)kill $(man1)kill.1

4
NEWS
View File

@ -1,3 +1,7 @@
procps-3.1.14 --> procps-3.1.15
install to /lib64 if it exists
procps-3.1.13 --> procps-3.1.14 procps-3.1.13 --> procps-3.1.14
top: displays on more genuine serial terminals top: displays on more genuine serial terminals

8
README
View File

@ -1,7 +1,7 @@
COMPATIBILITY COMPATIBILITY
This code is intended for use with Linux 2.2.xx, 2.4.xx, This code is intended for use with Linux 2.2.xx, 2.4.xx,
2.5.xx, and hopefully all future kernels. You should be 2.6.xx, and hopefully all future kernels. You should be
running a system with libc 6, but libc 5 might work too. running a system with libc 6, but libc 5 might work too.
INSTALLATION INSTALLATION
@ -31,6 +31,12 @@ INSTALLATION
make usr/bin=/tmp/fff/iii/ DESTDIR=/tmp/fff install="install -D" ldconfig=echo install make usr/bin=/tmp/fff/iii/ DESTDIR=/tmp/fff install="install -D" ldconfig=echo install
If cross-compiling, you might need to set lib64 to
either "lib" or "lib64", like one of these examples:
make lib64=lib CFLAGS="-O2 -m32"
make lib64=lib64 CC=x86_64-gcc
BUG REPORTS BUG REPORTS
Debian users should use the Debian bug tracking system. Debian users should use the Debian bug tracking system.

View File

@ -38,7 +38,7 @@ rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(0644,root,root,755) %defattr(0644,root,root,755)
%doc NEWS BUGS TODO COPYING COPYING.LIB README.top README AUTHORS %doc NEWS BUGS TODO COPYING COPYING.LIB README.top README AUTHORS
%attr(555,root,root) /lib/libproc.so* %attr(555,root,root) /lib*/libproc.so*
%attr(555,root,root) /bin/* %attr(555,root,root) /bin/*
%attr(555,root,root) /sbin/* %attr(555,root,root) /sbin/*
%attr(555,root,root) /usr/bin/* %attr(555,root,root) /usr/bin/*