Skip to content

Commit

Permalink
build: Get rid of obsolete .../lib64 LIBDIR on x86_64 Linux.
Browse files Browse the repository at this point in the history
Install to .../lib by default. Needs to be overridden manually
for proper multiarch support (eg. .../lib/x86_64-linux-gnu)
  • Loading branch information
keirf committed Jan 18, 2016
1 parent d8b32d6 commit dd056b2
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 15 deletions.
13 changes: 5 additions & 8 deletions README
Expand Up @@ -62,16 +62,13 @@ path for many of these tools to run. There are a few ways to ensure this:
# LD_LIBRARY_PATH=libdisk disk-analyse/disk-analyse # Linux
# DYLD_LIBRARY_PATH=libdisk disk-analyse/disk-analyse # Mac OS X
# PATH=$PATH:`pwd`/libdisk disk-analyse/disk-analyse # Cygwin
2. Install to a location on the system-wide search path. Unfortunately
the default install location for libdisk (/usr/local/lib64) on 64-bit
Linux is often not searched by default. If this is the case on your system,
you will need to add the path to /etc/ld.so.conf (or to a file in
/etc/ld.so.conf.d/ in some Linux distros). Then try the following as root:
# echo "/usr/local/lib64" >>/etc/ld.so.conf
2. Install to a location on the system-wide search path. If the default
install location for libdisk (/usr/local/lib) is not searched by default
then you will need to add the path to /etc/ld.so.conf (or to a file in
/etc/ld.so.conf.d/ in some Linux distros). For example:
# echo "/usr/local/lib" >>/etc/ld.so.conf
# ldconfig
You should now be able to run disk-analyse and other tools just fine.

This should not be necessary on 32-bit Linux, Windows, or Mac OS X.

Brief Descriptions:
-------------------
Expand Down
7 changes: 0 additions & 7 deletions Rules.mk
Expand Up @@ -18,14 +18,7 @@ endif
PREFIX ?= /usr/local
BINDIR = $(PREFIX)/bin
INCLUDEDIR = $(PREFIX)/include
ifeq ($(ARCH),x86_64)
LIBDIR = $(PREFIX)/lib64
else
LIBDIR = $(PREFIX)/lib
endif
ifeq ($(PLATFORM),osx)
LIBDIR = $(PREFIX)/lib
endif

$(ARCH) := y
CFLAGS-$(x86_32) += -m32 -march=i686
Expand Down

0 comments on commit dd056b2

Please sign in to comment.