Merge branch 'debian/sid' into debian/experimental

[apt.git] / buildlib / makefile.in

diff --git a/buildlib/makefile.in b/buildlib/makefile.in
index 7fceb9f4afac61dd309eee3f3dbd4a284bba54a8..66144cfc66193356d15809ecbfef845c7fe06ddd 100644 (file)
--- a/buildlib/makefile.in
+++ b/buildlib/makefile.in
@@ -5,12 +5,9 @@
 ifndef NOISY
 .SILENT:
 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
 
@@ -26,17 +23,24 @@ 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)
+dirs: 
+       $(MAKE) -C $(SRCDIR) -f Makefile $@
+ifeq ($(HAVE_STATVFS),yes)
+       @rm -f include/statvfs.h > /dev/null 2>&1
 else
-       @echo > /dev/null
-endif  
-ifneq ($(HAVE_C9X),yes)
-       -@rm include/inttypes.h 
+       @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