X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/0296c633c4ae31f9addfb57c6530815a54d22f62..a066913edd65c895190766465c1cbbffd99f0390:/buildlib/makefile.in

diff --git a/buildlib/makefile.in b/buildlib/makefile.in
index dbcc91cd6..756565f40 100644
--- a/buildlib/makefile.in
+++ b/buildlib/makefile.in
@@ -8,10 +8,6 @@ endif
 include environment.mak
 
 SRCDIR=@top_srcdir@
-DIRS:=./docs ./bin ./obj ./include ./scripts
-SUBDIRS:= $(DIRS) ./docs/examples ./bin/methods ./include/apt-pkg \
-         ./include/deity ./obj/apt-pkg ./obj/deity ./obj/gui ./obj/cmdline \
-         ./obj/test ./obj/methods ./obj/methods/ftp ./scripts/dselect
 BUILD:=$(shell pwd)
 export BUILD
 
@@ -27,17 +23,29 @@ maintainer-clean dist-clean pristine sanity distclean:
 	-rm -rf $(DIRS)
 	-rm -f config.cache config.log config.status environment.mak makefile
 	
-# This makes any missing directories
+# Create the required directories and build the shims
+# The configure script fills in below, and then we do the right things..
+# This cannot go in the configure script since the directories have not yet
+# been created.. In any event I like the idea that you can change environment.mak
+# and run make dirs and have the shims updated.
 .PHONY: dirs
-MISSING_DIRS:=	$(filter-out $(wildcard $(SUBDIRS)),$(SUBDIRS))
-dirs:
-ifneq ($(words $(MISSING_DIRS)),0)
-	@mkdir  $(MISSING_DIRS)
-else
-	@echo > /dev/null
-endif	
+dirs: 
+	$(MAKE) -C $(SRCDIR) -f Makefile $@
 ifeq ($(HAVE_C9X),yes)
-	-@rm include/inttypes.h > /dev/null 2>&1
+	@rm -f include/inttypes.h > /dev/null 2>&1
+else
+	@cp -p $(SRCDIR)/buildlib/inttypes.h.in include/inttypes.h
+endif
+ifeq ($(HAVE_STATVFS),yes)
+	@rm -f include/statvfs.h > /dev/null 2>&1
+else
+	@cp -p $(SRCDIR)/buildlib/statvfs.h.in include/statvfs.h
+	ln -sf . include/sys
+endif
+ifeq ($(NEED_SOCKLEN_T_DEFINE),yes)
+	@cp -p $(SRCDIR)/buildlib/netdb.h.in include/netdb.h
 else
-	@cp $(SRCDIR)/buildlib/inttypes.h.in include/inttypes.h
+	@rm -f include/netdb.h > /dev/null 2>&1
 endif
+	rm -f include/python
+	ln -sf $(PYTHONINCLUDE) include/python