X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=klibc%2FMakefile;h=5071e60da40ef6b3f8f7eef0d01273a5ffaccacb;hb=11a598f7ef4c263a6546b512806358970dfe5010;hp=a512aa308aeda11c05d2f7454bc3d4d64a803ba0;hpb=4272779706c53c635a3fa5431a4e8791402183b4;p=elogind.git

diff --git a/klibc/Makefile b/klibc/Makefile
index a512aa308..5071e60da 100644
--- a/klibc/Makefile
+++ b/klibc/Makefile
@@ -18,16 +18,19 @@ $(CROSS)klibc.config: Makefile
 	echo 'ARCH=$(ARCH)' >> $@
 	echo 'CROSS=$(CROSS)' >> $@
 	echo 'KCROSS=$(KCROSS)' >> $@
-	echo "CC=$(shell bash -c 'type -p $(CC)')" >> $@
-	echo "LD=$(shell bash -c 'type -p $(LD)')" >> $@
+	echo 'CC=$(CC)' >> $@
+	echo 'LD=$(LD)' >> $@
 	echo 'REQFLAGS=$(filter-out -I%,$(REQFLAGS))' >> $@
 	echo 'OPTFLAGS=$(OPTFLAGS)' >> $@
 	echo 'LDFLAGS=$(LDFLAGS)' >> $@
-	echo "STRIP=$(shell bash -c 'type -p $(STRIP)')" >> $@
+	echo 'STRIP=$(STRIP)' >> $@
 	echo 'STRIPFLAGS=$(STRIPFLAGS)' >> $@
 	echo 'EMAIN=$(EMAIN)' >> $@
 	echo 'BITSIZE=$(BITSIZE)' >> $@
-	echo 'INSTALLDIR=$(INSTALLDIR)' >> $@
+	echo 'prefix=$(INSTALLDIR)' >> $@
+	echo 'bindir=$(INSTALLDIR)/$(KCROSS)bin' >> $@
+	echo 'libdir=$(INSTALLDIR)/$(KCROSS)lib' >> $@
+	echo 'includedir=$(INSTALLDIR)/$(KCROSS)include' >> $@
 
 $(CROSS)klcc: klcc.in $(CROSS)klibc.config makeklcc.pl
 	$(PERL) makeklcc.pl klcc.in $(CROSS)klibc.config \
@@ -42,7 +45,7 @@ local-all: $(CROSS)klcc
 local-clean:
 	rm -f klibc.config klcc
 
-local-spotless:
+local-spotless: local-clean
 	rm -f klibc.spec *~ tags
 
 local-install: $(CROSS)klcc