--- Makefile 2008-05-09 00:36:56.000000000 -0400 +++ Makefile.oden 2008-06-08 11:55:10.000000000 -0400 @@ -7,6 +7,7 @@ prefix?=/opt/diet LIBDIR=${prefix}/lib BINDIR=${prefix}/bin MAN1DIR=${prefix}/man/man1 +INSTALLHOME=$(LIBDIR)/dietlibc EXTRACFLAGS= @@ -100,7 +101,7 @@ PIE=-fpie -fvisibility=hidden # ARCH=$(MYARCH) OBJDIR=bin-$(ARCH) -ILIBDIR=$(LIBDIR)-$(ARCH) +ILIBDIR=$(INSTALLHOME)/lib-$(ARCH) DIETHOME=$(shell pwd) @@ -356,7 +357,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 - $(CCC) -isystem include $(CFLAGS) -nostdlib -o $@ $^ -DDIETHOME=\"$(prefix)\" -DVERSION=\"$(VERSION)\" -DINSTALLVERSION -lgcc + $(CCC) -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 @@ -429,7 +430,7 @@ install-pic: 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