diff --git a/Makefile b/Makefile index b9027e9b..9df642ee 100644 --- a/Makefile +++ b/Makefile @@ -30,6 +30,9 @@ ln_f := ln -f ln_sf := ln -sf 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/ bin := $(DESTDIR)/bin/ sbin := $(DESTDIR)/sbin/ @@ -39,8 +42,8 @@ man5 := $(DESTDIR)/usr/share/man/man5/ man8 := $(DESTDIR)/usr/share/man/man8/ etc/X11/applnk/Utilities := $(DESTDIR)/etc/X11/applnk/Utilities/ usr/X11R6/bin := $(DESTDIR)/usr/X11R6/bin/ -lib := $(DESTDIR)/lib/ -usr/lib := $(DESTDIR)/usr/lib/ +lib := $(DESTDIR)/$(lib64)/ +usr/lib := $(DESTDIR)/usr/$(lib64)/ usr/include := $(DESTDIR)/usr/include/ #SKIP := $(bin)kill $(man1)kill.1 diff --git a/NEWS b/NEWS index a6a1910a..8e5fc8e6 100644 --- a/NEWS +++ b/NEWS @@ -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 top: displays on more genuine serial terminals diff --git a/README b/README index 25d27b84..de591561 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ COMPATIBILITY 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. INSTALLATION @@ -31,6 +31,12 @@ INSTALLATION 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 Debian users should use the Debian bug tracking system. diff --git a/procps.spec b/procps.spec index fb40be30..cecc3349 100644 --- a/procps.spec +++ b/procps.spec @@ -38,7 +38,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(0644,root,root,755) %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) /sbin/* %attr(555,root,root) /usr/bin/*