--- Makefile 2008-05-09 00:36:56.000000000 -0400 +++ Makefile.oden 2008-06-08 11:55:10.000000000 -0400 @@ -1,13 +1,9 @@ INSTALL=install -prefix?=/opt/diet +prefix?=/usr # Set the following to install to a different root #DESTDIR=/tmp/fefix # Use "make DEBUG=1" to compile a debug version. -LIBDIR=${prefix}/lib -BINDIR=${prefix}/bin -MAN1DIR=${prefix}/man/man1 - MYARCH:=$(shell uname -m | sed -e 's/i[4-9]86/i386/' -e 's/armv[3-7]t\?[eh]\?[lb]/arm/') # This extra-ugly cruft is here so make will not run uname and sed each @@ -83,8 +79,13 @@ # ARCH=$(MYARCH) +LIBDIR=${prefix}/lib +BINDIR=${prefix}/bin +MAN1DIR=${prefix}/share/man/man1 +INSTALLHOME=$(LIBDIR)/dietlibc + OBJDIR=bin-$(ARCH) -ILIBDIR=$(LIBDIR)-$(ARCH) +ILIBDIR=$(INSTALLHOME)/lib-$(ARCH) HOME=$(shell pwd) @@ -318,7 +319,7 @@ $(OBJDIR)/diet: $(OBJDIR)/start.o $(OBJD $(STRIP) -R .comment -R .note $@ $(OBJDIR)/diet-i: $(OBJDIR)/start.o $(OBJDIR)/dyn_start.o diet.c $(OBJDIR)/dietlibc.a $(OBJDIR)/dyn_stop.o - $(CROSS)$(CC) -isystem include $(CFLAGS) -nostdlib -o $@ $^ -DDIETHOME=\"$(prefix)\" -DVERSION=\"$(VERSION)\" -DINSTALLVERSION -lgcc + $(CROSS)$(CC) -isystem include $(CFLAGS) -nostdlib -o $@ $^ -DDIETHOME=\"$(INSTALLHOME)\" -DVERSION=\"$(VERSION)\" -DINSTALLVERSION -lgcc $(STRIP) -R .comment -R .note $@ $(PICODIR)/diet-dyn: $(PICODIR)/start.o $(PICODIR)/dyn_start.o diet.c @@ -380,7 +381,7 @@ if test -f $(PICODIR)/libc.so -a ! -f $(DESTDIR)/etc/diet.ld.conf; then echo "$(ILIBDIR)" > $(DESTDIR)/etc/diet.ld.conf; fi install-headers: - for i in `find include -name \*.h`; do install -m 644 -D $$i $(DESTDIR)$(prefix)/$$i; done + for i in `find include -name \*.h`; do install -m 644 -D $$i $(DESTDIR)$(INSTALLHOME)/$$i; done install: install-bin install-profiling install-pic install-headers