Use STAGING_DIR/usr/lib instead of STAGING_DIR/lib

package/asterisk/asterisk.mk

@@ -31,7 +31,7 @@ $(TARGET_DIR)/$(ASTERISK_TARGET_BINARY): $(ASTERISK_DIR)/$(ASTERISK_BINARY)
 	$(STRIP) $(TARGET_DIR)/usr/sbin/streamplayer
 	$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/asterisk/modules/*.so
 	$(INSTALL) -m 755 $(ASTERISK_DIR)/contrib/init.d/rc.debian.asterisk $(TARGET_DIR)/etc/init.d/S60asterisk
-	mv $(TARGET_DIR)/usr/include/asterisk $(STAGING_DIR)/include/
+	mv $(TARGET_DIR)/usr/include/asterisk $(STAGING_DIR)/usr/include/
 	rm -Rf $(TARGET_DIR)/usr/share/man
 	rm -f $(TARGET_DIR)/usr/sbin/safe_asterisk
 	rm -f $(TARGET_DIR)/usr/sbin/autosupport
@@ -43,7 +43,7 @@ asterisk: uclibc ncurses zlib openssl mpg123 $(TARGET_DIR)/$(ASTERISK_TARGET_BIN
 asterisk-source: $(DL_DIR)/$(ASTERISK_SOURCE)
 
 asterisk-clean:
-	rm -Rf $(STAGING_DIR)/include/asterisk
+	rm -Rf $(STAGING_DIR)/usr/include/asterisk
 	rm -Rf $(TARGET_DIR)/etc/asterisk
 	rm -Rf $(TARGET_DIR)/usr/lib/asterisk
 	rm -Rf $(TARGET_DIR)/var/lib/asterisk

package/aumix/aumix.mk

@@ -28,7 +28,7 @@ $(AUMIX_DIR)/.configured: $(AUMIX_DIR)/.unpacked
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--libdir=$(STAGING_DIR)/lib \
-		--includedir=$(STAGING_DIR)/include \
+		--includedir=$(STAGING_DIR)/usr/include \
 		--without-gtk \
 		--without-gtk1 \
 		--without-alsa \

package/avahi/avahi.mk

@@ -4,10 +4,10 @@
 #
 #############################################################
 #
-# This program is free software; you can redistribute it 
-# and/or modify it under the terms of the GNU Lesser General 
-# Public License as published by the Free Software Foundation; 
-# either version 2.1 of the License, or (at your option) any 
+# This program is free software; you can redistribute it
+# and/or modify it under the terms of the GNU Lesser General
+# Public License as published by the Free Software Foundation;
+# either version 2.1 of the License, or (at your option) any
 # later version.
 
 AVAHI_VERSION:=0.6.19
@@ -48,7 +48,7 @@ $(AVAHI_DIR)/.configured: $(AVAHI_DIR)/.unpacked $(AVAHI_EXPAT_DEP)
 	(cd $(AVAHI_DIR) && \
 		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CONFIGURE_ARGS) \
-		LIBDAEMON_CFLAGS="-I$(STAGING_DIR)/include" \
+		LIBDAEMON_CFLAGS="-I$(STAGING_DIR)/usr/include" \
 		LIBDAEMON_LIBS="-L$(STAGING_DIR)/lib -ldaemon" \
 		ac_cv_func_strtod=yes \
 		ac_fsusage_space=yes \
@@ -116,7 +116,7 @@ $(AVAHI_DIR)/.configured: $(AVAHI_DIR)/.unpacked $(AVAHI_EXPAT_DEP)
 		--sysconfdir=/etc \
 		--datadir=/usr/share \
 		--localstatedir=/var \
-		--includedir=/include \
+		--includedir=/usr/include \
 		--mandir=/usr/man \
 		--infodir=/usr/info \
 		$(DISABLE_NLS) \

package/berkeleydb/berkeleydb.mk

@@ -36,7 +36,7 @@ $(DB_DIR)/.configured: $(DB_DIR)/.dist
 		--sysconfdir=/etc \
 		--datadir=/usr/share \
 		--localstatedir=/var \
-		--includedir=/include \
+		--includedir=/usr/include \
 		--mandir=/usr/man \
 		--infodir=/usr/info \
 		--with-gnu-ld \
@@ -47,7 +47,7 @@ $(DB_DIR)/.configured: $(DB_DIR)/.dist
 		--disable-tcl \
 		--disable-compat185 \
 		--with-pic \
-	        $(DISABLE_LARGEFILE) \
+		$(DISABLE_LARGEFILE) \
 	);
 	$(SED) 's/\.lo/.o/g' $(DB_DIR)/build_unix/Makefile
 	touch $(DB_DIR)/.configured
@@ -70,7 +70,7 @@ $(TARGET_DIR)/lib/$(DB_SHARLIB): $(STAGING_DIR)/lib/$(DB_SHARLIB)
 	-$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libdb*so*
 
 $(TARGET_DIR)/usr/lib/libdb.a: $(STAGING_DIR)/lib/libdb-$(DB_SO_VERSION).a
-	cp -dpf $(STAGING_DIR)/include/db.h $(TARGET_DIR)/usr/include/
+	cp -dpf $(STAGING_DIR)/usr/include/db.h $(TARGET_DIR)/usr/include/
 	cp -dpf $(STAGING_DIR)/lib/libdb*.a $(TARGET_DIR)/usr/lib/
 	cp -dpf $(STAGING_DIR)/lib/libdb*.la $(TARGET_DIR)/usr/lib/
 	touch -c $(TARGET_DIR)/usr/lib/libdb.a

package/cairo/cairo.mk

@@ -95,13 +95,13 @@ $(CAIRO_DIR)/.configured: $(CAIRO_DIR)/.unpacked
 		--sysconfdir=/etc \
 		--datadir=/usr/share \
 		--localstatedir=/var \
-		--includedir=/include \
+		--includedir=/usr/include \
 		--mandir=/usr/man \
 		--infodir=/usr/info \
 		--enable-shared \
 		--enable-static \
 		--with-x \
-		--x-includes=$(STAGING_DIR)/include \
+		--x-includes=$(STAGING_DIR)/usr/include \
 		--x-libraries=$(STAGING_DIR)/lib \
 		--enable-ps=yes \
 		--enable-pdf=yes \

package/curl/curl.mk

@@ -63,7 +63,7 @@ curl-clean:
 	rm -f $(TARGET_DIR)/usr/bin/curl
 	rm -f $(STAGING_DIR)/bin/curl*
 	rm -f $(STAGING_DIR)/lib/libcurl.so*
-	rm -rf $(STAGING_DIR)/include/curl
+	rm -rf $(STAGING_DIR)/usr/include/curl
 	-$(MAKE) -C $(CURL_DIR) clean
 
 curl-dirclean:

package/dbus-glib/dbus-glib.mk

@@ -30,7 +30,7 @@ $(DBUS_GLIB_DIR)/.configured: $(DBUS_GLIB_DIR)/.unpacked /usr/bin/pkg-config
 		have_abstract_sockets=yes \
 		DBUS_CFLAGS="-I$(STAGING_DIR)/usr/include/dbus-1.0 -I$(STAGING_DIR)/usr/lib/dbus-1.0/include" \
 		DBUS_LIBS="$(STAGING_DIR)/usr/lib/libdbus-1.so" \
-		DBUS_GLIB_CFLAGS="-I$(STAGING_DIR)/include/glib-2.0 -I$(STAGING_DIR)/lib/glib-2.0/include" \
+		DBUS_GLIB_CFLAGS="-I$(STAGING_DIR)/usr/include/glib-2.0 -I$(STAGING_DIR)/usr/lib/glib-2.0/include" \
 		DBUS_GLIB_LIBS="$(STAGING_DIR)/lib/libglib-2.0.so $(STAGING_DIR)/lib/libgobject-2.0.so $(STAGING_DIR)/lib/libgmodule-2.0.so $(STAGING_DIR)/lib/libgthread-2.0.so" \
 		PKG_CONFIG=/usr/bin/pkg-config \
 		./configure \

package/dmalloc/dmalloc.mk

@@ -58,7 +58,7 @@ $(DMALLOC_DIR)/.configured: $(DMALLOC_DIR)/.unpacked
 		--sysconfdir=/etc \
 		--datadir=/usr/share \
 		--localstatedir=/var \
-		--includedir=/include \
+		--includedir=/usr/include \
 		--mandir=/usr/man \
 		--infodir=/usr/info \
 		--enable-shlib \
@@ -84,14 +84,14 @@ $(TARGET_DIR)/$(DMALLOC_TARGET_BINARY): $(DMALLOC_DIR)/$(DMALLOC_BINARY)
 
 dmalloc: uclibc $(TARGET_DIR)/$(DMALLOC_TARGET_BINARY)
 
-dmalloc-clean: 
+dmalloc-clean:
 	rm -f $(TARGET_DIR)/usr/lib/libdmalloc*
 	rm -f $(STAGING_DIR)/usr/lib/libdmalloc*
-	rm -f $(STAGING_DIR)/include/dmalloc.h
+	rm -f $(STAGING_DIR)/usr/include/dmalloc.h
 	rm -f $(TARGET_DIR)/$(DMALLOC_TARGET_BINARY)
 	$(MAKE) -C $(DMALLOC_DIR) clean
 
-dmalloc-dirclean: 
+dmalloc-dirclean:
 	rm -rf $(DMALLOC_DIR)
 
 

package/freetype/freetype.mk

@@ -38,7 +38,7 @@ $(FREETYPE_DIR)/.configured: $(FREETYPE_DIR)/.unpacked
 		--sysconfdir=/etc \
 		--datadir=/usr/share \
 		--localstatedir=/var \
-		--includedir=/include \
+		--includedir=/usr/include \
 		--mandir=/usr/man \
 		--infodir=/usr/info \
 	);
@@ -53,7 +53,7 @@ $(STAGING_DIR)/lib/libfreetype.so: $(FREETYPE_DIR)/.compiled
 	$(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/lib\',g" $(STAGING_DIR)/lib/libfreetype.la
 	$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)\',g" \
 		-e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \
-		-e "s,^includedir=.*,includedir=\'$(STAGING_DIR)/include\',g" \
+		-e "s,^includedir=.*,includedir=\'$(STAGING_DIR)/usr/include\',g" \
 		-e "s,^libdir=.*,libdir=\'$(STAGING_DIR)/lib\',g" \
 		$(STAGING_DIR)/usr/bin/freetype-config
 	touch -c $(STAGING_DIR)/lib/libfreetype.so

package/gtk2-engines/gtk2-engines.mk

@@ -100,11 +100,11 @@ $(GTK2_ENGINES_DIR)/.configured: $(GTK2_ENGINES_DIR)/.unpacked
 		--sysconfdir=/etc \
 		--datadir=/usr/share \
 		--localstatedir=/var \
-		--includedir=/include \
+		--includedir=/usr/include \
 		--mandir=/usr/man \
 		--infodir=/usr/info \
 		--with-x \
-		--x-includes=$(STAGING_DIR)/include \
+		--x-includes=$(STAGING_DIR)/usr/include \
 		--x-libraries=$(STAGING_DIR)/lib \
 		--disable-glibtest \
 		--enable-explicit-deps=no \

package/hal/hal.mk

@@ -11,7 +11,7 @@ HAL_CAT:=$(ZCAT)
 HAL_BINARY:=hald/hald
 HAL_TARGET_BINARY:=usr/sbin/hald
 
-GLIB_CFLAGS:=-I$(STAGING_DIR)/include/glib-2.0 \
+GLIB_CFLAGS:=-I$(STAGING_DIR)/usr/include/glib-2.0 \
 	     -I$(STAGING_DIR)/lib/glib/include
 GLIB_LIBS:=$(STAGING_DIR)/lib/libglib-2.0.so	\
 	   $(STAGING_DIR)/lib/libgmodule-2.0.so \
@@ -69,6 +69,7 @@ $(TARGET_DIR)/$(HAL_TARGET_BINARY): $(HAL_DIR)/hald/hald
 	rm -rf $(TARGET_DIR)/usr/share/gtk-doc
 	rm -rf $(TARGET_DIR)/usr/share/hal/device-manager
 	rm -rf $(TARGET_DIR)/usr/lib/pkgconfig
+	# remove _everything_ in $(TARGET_DIR)/usr/include?
 	rm -rf $(TARGET_DIR)/usr/include
 	rm -rf $(TARGET_DIR)/usr/lib/libhal*.so
 	rm -rf $(TARGET_DIR)/usr/lib/libhal*.la

package/hotplug/hotplug.mk

@@ -15,7 +15,7 @@ $(HOTPLUG_DIR): $(HOTPLUG_SOURCE)
 
 $(HOTPLUG_DIR)/hotplug: $(HOTPLUG_DIR)
 	$(MAKE) CROSS=$(TARGET_CROSS) DEBUG=false KLIBC=false \
-	    KERNEL_INCLUDE_DIR=$(STAGING_DIR)/include \
+	    KERNEL_INCLUDE_DIR=$(STAGING_DIR)/usr/include \
 	    TARGET_DIR=$(TARGET_DIR) -C $(HOTPLUG_DIR);
 	$(STRIP) $(HOTPLUG_DIR)/hotplug;
 	touch -c $(HOTPLUG_DIR)/hotplug

package/iperf/iperf.mk

@@ -42,7 +42,7 @@ $(IPERF_DIR)/.configured: $(IPERF_DIR)/.unpacked
 		--localstatedir=/var \
 		--mandir=/usr/man \
 		--infodir=/usr/info \
-		--includedir=$(STAGING_DIR)/include \
+		--includedir=$(STAGING_DIR)/usr/include \
 	);
 	touch $(IPERF_DIR)/.configured
 

package/libglib12/libglib12.mk

@@ -38,7 +38,7 @@ $(LIBGLIB12_DIR)/.configured: $(LIBGLIB12_DIR)/.unpacked
 		--sysconfdir=/etc \
 		--datadir=/usr/share \
 		--localstatedir=/var \
-		--includedir=/include \
+		--includedir=/usr/include \
 		--mandir=/usr/man \
 		--infodir=/usr/info \
 		--enable-shared \
@@ -60,7 +60,7 @@ $(STAGING_DIR)/lib/$(LIBGLIB12_BINARY): $(LIBGLIB12_DIR)/.libs/$(LIBGLIB12_BINAR
 	    sharedstatedir=$(STAGING_DIR)/com \
 	    localstatedir=$(STAGING_DIR)/var \
 	    libdir=$(STAGING_DIR)/lib \
-	    includedir=$(STAGING_DIR)/include \
+	    includedir=$(STAGING_DIR)/usr/include \
 	    oldincludedir=$(STAGING_DIR)/include \
 	    infodir=$(STAGING_DIR)/info \
 	    mandir=$(STAGING_DIR)/man \

package/libgtk12/libgtk12.mk

@@ -40,7 +40,7 @@ $(LIBGTK12_DIR)/.configured: $(LIBGTK12_DIR)/.unpacked
 		--sysconfdir=/etc \
 		--datadir=/usr/share \
 		--localstatedir=/var \
-		--includedir=/include \
+		--includedir=/usr/include \
 		--mandir=/usr/man \
 		--infodir=/usr/info \
 		$(DISABLE_NLS) \
@@ -68,7 +68,7 @@ $(STAGING_DIR)/lib/$(LIBGTK12_BINARY): $(LIBGTK12_DIR)/gtk/.libs/$(LIBGTK12_BINA
 	    sharedstatedir=$(STAGING_DIR)/com \
 	    localstatedir=$(STAGING_DIR)/var \
 	    libdir=$(STAGING_DIR)/lib \
-	    includedir=$(STAGING_DIR)/include \
+	    includedir=$(STAGING_DIR)/usr/include \
 	    oldincludedir=$(STAGING_DIR)/include \
 	    infodir=$(STAGING_DIR)/info \
 	    mandir=$(STAGING_DIR)/man \

package/libgtk2/libgtk2.mk

@@ -88,7 +88,7 @@ $(LIBGTK2_DIR)/.configured: $(LIBGTK2_DIR)/.unpacked
 	# The following is an truely evil hack!
 	# I dont yet understand why configure is not doing this right
 	# TODO: also remove 'odd-include-problem.patch' when this is fixed
-	$(SED) "s,^GDK_DEP_CFLAGS=.*,GDK_DEP_CFLAGS=\'-pthread -I$(STAGING_DIR)/include/glib-2.0 -I$(STAGING_DIR)/lib/glib-2.0/include -I$(STAGING_DIR)/include/pango-1.0 -I$(STAGING_DIR)/include/cairo\',g" $(LIBGTK2_DIR)/configure
+	$(SED) "s,^GDK_DEP_CFLAGS=.*,GDK_DEP_CFLAGS=\'-pthread -I$(STAGING_DIR)/usr/include/glib-2.0 -I$(STAGING_DIR)/lib/glib-2.0/include -I$(STAGING_DIR)/usr/include/pango-1.0 -I$(STAGING_DIR)/usr/include/cairo\',g" $(LIBGTK2_DIR)/configure
 	$(SED) "s,^GDK_DEP_LIBS=.*,GDK_DEP_LIBS=\'-L$(STAGING_DIR)/lib -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -lfontconfig -lXext -lXrender -lX11 -lXinerama -lXrandr -lXcursor -lXfixes -lXft -lm\',g" $(LIBGTK2_DIR)/configure
 	(cd $(LIBGTK2_DIR); rm -rf config.cache; \
 		$(LIBGTK2_BUILD_ENV) \
@@ -105,13 +105,13 @@ $(LIBGTK2_DIR)/.configured: $(LIBGTK2_DIR)/.unpacked
 		--sysconfdir=/etc \
 		--datadir=/usr/share \
 		--localstatedir=/var \
-		--includedir=/include \
+		--includedir=/usr/include \
 		--mandir=/usr/man \
 		--infodir=/usr/info \
 		--enable-shared \
 		--enable-static \
 		--with-x \
-		--x-includes=$(STAGING_DIR)/include \
+		--x-includes=$(STAGING_DIR)/usr/include \
 		--x-libraries=$(STAGING_DIR)/lib \
 		--disable-glibtest \
 		--enable-explicit-deps=no \

package/liblockfile/liblockfile.mk

@@ -48,8 +48,8 @@ liblockfile: uclibc $(TARGET_DIR)/usr/lib/$(LIBLOCKFILE_BINARY)
 liblockfile-clean:
 	rm -f $(TARGET_DIR)/usr/lib/liblockfile.so*
 	rm -f $(STAGING_DIR)/lib/liblockfile*
-	rm -f $(STAGING_DIR)/include/lockfile.h
-	rm -f $(STAGING_DIR)/include/mailfile.h
+	rm -f $(STAGING_DIR)/usr/include/lockfile.h
+	rm -f $(STAGING_DIR)/usr/include/mailfile.h
 	rm -rf $(STAGING_DIR)/man
 	$(MAKE) -C $(LIBLOCKFILE_DIR) clean
 

package/libusb/libusb.mk

@@ -48,7 +48,7 @@ libusb: uclibc $(TARGET_DIR)/$(LIBUSB_BINARY)
 
 libusb-clean:
 	rm -f $(STAGING_DIR)/bin/libusb-config
-	rm -f $(STAGING_DIR)/includes/usb*.h
+	rm -f $(STAGING_DIR)/usr/includes/usb*.h
 	rm -f $(STAGING_DIR)/lib/libusb*
 	rm -rf $(STAGING_DIR)/lib/pkgconfig
 	rm -f $(TARGET_DIR)/usr/lib/libusb*

package/mpatrol/mpatrol.mk

@@ -62,22 +62,22 @@ $(TARGET_DIR)/$(MPATROL_TARGET_BINARY): $(MPATROL_BUILD_DIR)/$(MPATROL_BINARY)
 		ln -sf libpthread.so.0 $(TARGET_DIR)/lib/libpthread.so; fi
 	(cd $(MPATROL_DIR); \
 		cp -dpf bin/mp* bin/hexwords $(TARGET_DIR)/usr/bin; \
-		cp -dpf src/mp*.h $(STAGING_DIR)/include; \
-		mkdir -p $(STAGING_DIR)/include/mpatrol; \
-		cp -dpf tools/*.h $(STAGING_DIR)/include/mpatrol)
+		cp -dpf src/mp*.h $(STAGING_DIR)/usr/include; \
+		mkdir -p $(STAGING_DIR)/usr/include/mpatrol; \
+		cp -dpf tools/*.h $(STAGING_DIR)/usr/include/mpatrol)
 	touch $(TARGET_DIR)/$(MPATROL_TARGET_BINARY)
 
 mpatrol: uclibc $(MPATROL_SYMBOL_DEPS) $(TARGET_DIR)/$(MPATROL_TARGET_BINARY)
 
-mpatrol-clean: 
+mpatrol-clean:
 	(cd $(TARGET_DIR)/usr/lib; rm -f libmpatrol* libmpalloc*)
 	(cd $(TARGET_DIR)/usr/bin; \
 		rm -f mpatrol mprof mptrace mleak mpsym mpedit hexwords)
-	(cd $(STAGING_DIR)/include; \
+	(cd $(STAGING_DIR)/usr/include; \
 		rm -rf mpatrol.h mpalloc.h mpdebug.h mpatrol)
 	$(MAKE) -C $(MPATROL_DIR)/build/unix clobber
 
-mpatrol-dirclean: 
+mpatrol-dirclean:
 	rm -rf $(MPATROL_DIR)
 
 

package/mplayer/mplayer.mk

@@ -38,7 +38,7 @@ $(MPLAYER_DIR)/.configured: $(MPLAYER_DIR)/.unpacked
 		--host-cc=$(HOSTCC) \
 		--cc=$(TARGET_CC) \
 		--as=$(TARGET_CROSS)as \
-		--with-extraincdir=$(STAGING_DIR)/include \
+		--with-extraincdir=$(STAGING_DIR)/usr/include \
 		--with-extralibdir=$(STAGING_DIR)/lib \
 		--enable-mad \
 		--enable-fbdev \

package/mtd/20061007/mtd.mk

@@ -84,7 +84,7 @@ MTD_BUILD_TARGETS := $(addprefix $(MTD_DIR)/, $(MTD_TARGETS_y))
 
 $(MTD_BUILD_TARGETS): $(MTD_DIR)/.unpacked
 	mkdir -p $(TARGET_DIR)/usr/sbin
-	$(MAKE) CFLAGS="-I. -I./include -I$(LINUX_HEADERS_DIR)/include -I$(STAGING_DIR)/include $(TARGET_CFLAGS)" \
+	$(MAKE) CFLAGS="-I. -I./include -I$(LINUX_HEADERS_DIR)/include -I$(STAGING_DIR)/usr/include $(TARGET_CFLAGS)" \
 		CROSS= CC=$(TARGET_CC) LINUXDIR=$(LINUX_DIR) WITHOUT_XATTR=1 -C $(MTD_DIR)
 
 MTD_TARGETS := $(addprefix $(TARGET_DIR)/usr/sbin/, $(MTD_TARGETS_y))

package/pango/pango.mk

@@ -100,13 +100,13 @@ $(PANGO_DIR)/.configured: $(PANGO_DIR)/.unpacked
 		--sysconfdir=/etc \
 		--datadir=/usr/share \
 		--localstatedir=/var \
-		--includedir=/include \
+		--includedir=/usr/include \
 		--mandir=/usr/man \
 		--infodir=/usr/info \
 		--enable-shared \
 		--enable-static \
 		--with-x \
-		--x-includes=$(STAGING_DIR)/include \
+		--x-includes=$(STAGING_DIR)/usr/include \
 		--x-libraries=$(STAGING_DIR)/lib \
 		--disable-glibtest \
 		--enable-explicit-deps=no \

package/python/python.mk

@@ -61,7 +61,7 @@ $(PYTHON_DIR)/.configured: $(PYTHON_DIR)/.hostpython
 $(PYTHON_DIR)/$(PYTHON_BINARY): $(PYTHON_DIR)/.configured
 	export PYTHON_DISABLE_SSL=1
 	$(MAKE) CC=$(TARGET_CC) -C $(PYTHON_DIR) DESTDIR=$(TARGET_DIR) \
-		PYTHON_MODULES_INCLUDE=$(STAGING_DIR)/include \
+		PYTHON_MODULES_INCLUDE=$(STAGING_DIR)/usr/include \
 		PYTHON_MODULES_LIB=$(STAGING_DIR)/lib \
 		PYTHON_DISABLE_MODULES="$(BR2_PYTHON_DISABLED_MODULES)" \
 		HOSTPYTHON=./hostpython HOSTPGEN=./Parser/hostpgen
@@ -71,7 +71,7 @@ $(TARGET_DIR)/$(PYTHON_TARGET_BINARY): $(PYTHON_DIR)/$(PYTHON_BINARY)
 	LD_LIBRARY_PATH=$(STAGING_DIR)/lib
 	$(MAKE) CC=$(TARGET_CC) -C $(PYTHON_DIR) install \
 		DESTDIR=$(TARGET_DIR) CROSS_COMPILE=yes \
-		PYTHON_MODULES_INCLUDE=$(STAGING_DIR)/include \
+		PYTHON_MODULES_INCLUDE=$(STAGING_DIR)/usr/include \
 		PYTHON_MODULES_LIB=$(STAGING_DIR)/lib \
 		PYTHON_DISABLE_MODULES="$(BR2_PYTHON_DISABLED_MODULES)" \
 		HOSTPYTHON=./hostpython HOSTPGEN=./Parser/hostpgen && \

package/sed/sed.mk

@@ -116,7 +116,6 @@ $(SED_DIR2)/.configured: $(SED_DIR2)/.unpacked
 		--localstatedir=/var \
 		--mandir=/usr/man \
 		--infodir=/usr/info \
-		--include=$(STAGING_DIR)/include \
 		--include=$(STAGING_DIR)/usr/include \
 		$(DISABLE_NLS) \
 	);

package/tcpdump/tcpdump.mk

@@ -1,6 +1,6 @@
 #############################################################
 #
-# tcpdump 
+# tcpdump
 #
 #############################################################
 # Copyright (C) 2001-2003 by Erik Andersen <andersen@codepoet.org>
@@ -42,7 +42,7 @@ $(TCPDUMP_DIR)/.configured: $(TCPDUMP_DIR)/.unpacked
 		--sysconfdir=/etc \
 		--datadir=/usr/share \
 		--localstatedir=/var \
-		--includedir=/include \
+		--includedir=/usr/include \
 		--mandir=/usr/man \
 		--infodir=/usr/info \
 		--with-build-cc="$(HOSTCC)" \
@@ -56,7 +56,7 @@ $(TCPDUMP_DIR)/tcpdump: $(TCPDUMP_DIR)/.configured
 	$(MAKE) CC="$(TARGET_CC)" \
 		LDFLAGS="-L$(STAGING_DIR)/lib" \
 		LIBS="-lpcap" \
-		INCLS="-I. -I$(STAGING_DIR)/include" \
+		INCLS="-I. -I$(STAGING_DIR)/usr/include" \
 		-C $(TCPDUMP_DIR)
 
 $(TARGET_DIR)/sbin/tcpdump: $(TCPDUMP_DIR)/tcpdump

package/tiff/tiff.mk

@@ -40,16 +40,16 @@ $(TIFF_DIR)/.configured: $(TIFF_DIR)/.unpacked
 		--sysconfdir=/etc \
 		--datadir=/usr/share \
 		--localstatedir=/var \
-		--includedir=/include \
+		--includedir=/usr/include \
 		--mandir=/usr/man \
 		--infodir=/usr/info \
 		--enable-shared \
 		--enable-static \
 		--disable-cxx \
 		--without-x \
-		--with-jpeg-include-dir=$(STAGING_DIR)/include \
+		--with-jpeg-include-dir=$(STAGING_DIR)/usr/include \
 		--with-jpeg-lib-dir=$(STAGING_DIR)/lib \
-		--with-zlib-include-dir=$(STAGING_DIR)/include \
+		--with-zlib-include-dir=$(STAGING_DIR)/usr/include \
 		--with-zlib-lib-dir=$(STAGING_DIR)/lib \
 	);
 	touch $(TIFF_DIR)/.configured

package/udev/udev.mk

@@ -63,7 +63,7 @@ $(STAGING_DIR)/usr/lib/libvolume_id.so.0.72.0:
 	$(MAKE) CROSS_COMPILE=$(TARGET_CROSS) \
 		USE_LOG=false USE_SELINUX=false \
 		udevdir=$(UDEV_ROOT) EXTRAS="extras/volume_id" -C $(UDEV_DIR)
-	$(INSTALL) -m 0644 -D $(UDEV_DIR)/extras/volume_id/lib/libvolume_id.h $(STAGING_DIR)/include/libvolume_id.h
+	$(INSTALL) -m 0644 -D $(UDEV_DIR)/extras/volume_id/lib/libvolume_id.h $(STAGING_DIR)/usr/include/libvolume_id.h
 	$(INSTALL) -m 0755 -D $(UDEV_DIR)/extras/volume_id/lib/libvolume_id.so.0.72.0 $(STAGING_DIR)/usr/lib/libvolume_id.so.0.72.0
 	-ln -sf libvolume_id.so.0.72.0 $(STAGING_DIR)/usr/lib/libvolume_id.so.0
 	-ln -sf libvolume_id.so.0 $(STAGING_DIR)/usr/lib/libvolume_id.so
@@ -77,7 +77,7 @@ $(TARGET_DIR)/lib/udev/vol_id: $(STAGING_DIR)/usr/lib/libvolume_id.so.0.72.0
 udev-volume_id: udev $(TARGET_DIR)/lib/udev/vol_id
 
 udev-volume_id-clean:
-	rm -f $(STAGING_DIR)/include/libvolume_id.h
+	rm -f $(STAGING_DIR)/usr/include/libvolume_id.h
 	rm -f $(STAGING_DIR)/usr/lib/libvolume_id.so*
 	rm -f $(TARGET_DIR)/usr/lib/libvolume_id.so.0*
 	rm -f $(TARGET_DIR)/lib/udev/vol_id

package/vpnc/vpnc.mk

@@ -27,17 +27,18 @@ $(VPNC_DIR)/.configured: $(VPNC_DIR)/.unpacked
 
 $(VPNC_BINARY): $(VPNC_DIR)/.configured
 	rm -f $@
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) INCLUDE=$(STAGING_DIR)/include	CC=$(TARGET_CC) -C $(VPNC_DIR)
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) INCLUDE=$(STAGING_DIR)/usr/include \
+		CC=$(TARGET_CC) -C $(VPNC_DIR)
 
 $(VPNC_TARGET_BINARY): $(VPNC_BINARY)
-	$(MAKE) $(TARGET_CONFIGURE_OPTS)	\
-		DESTDIR=$(TARGET_DIR)		\
-		BINDIR=/usr/local/bin		\
-		SBINDIR=/usr/local/sbin		\
-		ETCDIR=/etc/vpnc		\
-		MANDIR=/usr/local/share/man	\
-		VERSION=$(VPNC_VERSION)		\
-		INCLUDE=$(STAGING_DIR)/include		\
+	$(MAKE) $(TARGET_CONFIGURE_OPTS)		\
+		DESTDIR=$(TARGET_DIR)			\
+		BINDIR=/usr/local/bin			\
+		SBINDIR=/usr/local/sbin			\
+		ETCDIR=/etc/vpnc			\
+		MANDIR=/usr/local/share/man		\
+		VERSION=$(VPNC_VERSION)			\
+		INCLUDE=$(STAGING_DIR)/usr/include	\
 		LDFLAGS="-g -lgcrypt -lgpg-error"	\
 		-C $(VPNC_DIR) install
 	$(STRIP) --strip-unneeded $(VPNC_TARGET_BINARY)
@@ -46,7 +47,7 @@ $(VPNC_TARGET_BINARY): $(VPNC_BINARY)
 
 
 
-vpnc:	uclibc $(VPNC_TARGET_BINARY) 
+vpnc:	uclibc $(VPNC_TARGET_BINARY)
 
 vpnc-source: $(DL_DIR)/$(VPNC_SOURCE)
 

package/xerces/xerces.mk

@@ -22,7 +22,6 @@ $(XERCES_DIR)/.unpacked: $(DL_DIR)/$(XERCES_SOURCE)
 
 $(XERCES_DIR)/.configured: $(XERCES_DIR)/.unpacked
 	(cd $(XERCES_DIR)/src/xercesc; rm -rf config.cache; \
-		$(TARGET_CONFIGURE_ARGS) \
 		$(TARGET_CONFIGURE_OPTS) \
 		XERCESCROOT=$(XERCES_DIR) \
 		./runConfigure -plinux -minmem \
@@ -47,7 +46,7 @@ $(TARGET_DIR)/usr/$(XERCES_BINARY): $(STAGING_DIR)/$(XERCES_BINARY)
 xerces: uclibc $(TARGET_DIR)/usr/$(XERCES_BINARY)
 
 xerces-clean:
-	rm -rf $(STAGING_DIR)/include/xercesc
+	rm -rf $(STAGING_DIR)/usr/include/xercesc
 	rm -f $(STAGING_DIR)/lib/libxerces*
 	rm -f $(TARGET_DIR)/usr/lib/libxerces*
 	-$(MAKE) -C $(XERCES_DIR) clean

target/device/Sharp/LNode80/linux.mk

@@ -98,11 +98,11 @@ $(LINUX_KERNEL): $(LINUX_DIR)/$(LINUX_BINLOC)
 	touch -c $(LINUX_KERNEL)
 
 $(STAGING_DIR)/include/linux/version.h: $(LINUX_DIR)/.configured
-	mkdir -p $(STAGING_DIR)/include
-	tar -ch -C $(LINUX_DIR)/include -f - linux | tar -xf - -C $(STAGING_DIR)/include/
-	tar -ch -C $(LINUX_DIR)/include -f - asm | tar -xf - -C $(STAGING_DIR)/include/
+	mkdir -p $(STAGING_DIR)/usr/include
+	tar -ch -C $(LINUX_DIR)/include -f - linux | tar -xf - -C $(STAGING_DIR)/usr/include/
+	tar -ch -C $(LINUX_DIR)/include -f - asm | tar -xf - -C $(STAGING_DIR)/usr/include/
 
-linux: $(STAGING_DIR)/include/linux/version.h $(LINUX_KERNEL)
+linux: $(STAGING_DIR)/usr/include/linux/version.h $(LINUX_KERNEL)
 
 linux-source: $(DL_DIR)/$(LINUX_SOURCE)
 

target/device/Soekris/net4521/linux.mk

@@ -106,12 +106,12 @@ $(TARGET_DIR)/lib/modules/$(LINUX_VERSION)/modules.dep: $(LINUX_KERNEL)
 		INSTALL_MOD_PATH=$(TARGET_DIR) modules_install
 	(cd $(TARGET_DIR)/lib/modules; ln -s $(LINUX_VERSION)/kernel/drivers .)
 
-$(STAGING_DIR)/include/linux/version.h: $(LINUX_DIR)/.configured
-	mkdir -p $(STAGING_DIR)/include
-	tar -ch -C $(LINUX_DIR)/include -f - linux | tar -xf - -C $(STAGING_DIR)/include/
-	tar -ch -C $(LINUX_DIR)/include -f - asm | tar -xf - -C $(STAGING_DIR)/include/
+$(STAGING_DIR)/usr/include/linux/version.h: $(LINUX_DIR)/.configured
+	mkdir -p $(STAGING_DIR)/usr/include
+	tar -ch -C $(LINUX_DIR)/include -f - linux | tar -xf - -C $(STAGING_DIR)/usr/include/
+	tar -ch -C $(LINUX_DIR)/include -f - asm | tar -xf - -C $(STAGING_DIR)/usr/include/
 
-linux: $(STAGING_DIR)/include/linux/version.h $(TARGET_DIR)/lib/modules/$(LINUX_VERSION)/modules.dep
+linux: $(STAGING_DIR)/usr/include/linux/version.h $(TARGET_DIR)/lib/modules/$(LINUX_VERSION)/modules.dep
 
 linux-source: $(DL_DIR)/$(LINUX_SOURCE)
 

target/device/Via/epia-mii/linux.mk

@@ -95,12 +95,12 @@ $(TARGET_DIR)/lib/modules/$(LINUX_VERSION)/modules.dep: $(LINUX_KERNEL)
 	$(MAKE) -C $(LINUX_DIR) INSTALL_MOD_PATH=$(TARGET_DIR) modules_install
 	(cd $(TARGET_DIR)/lib/modules; ln -s $(LINUX_VERSION)/kernel/drivers .)
 
-$(STAGING_DIR)/include/linux/version.h: $(LINUX_DIR)/.configured
-	mkdir -p $(STAGING_DIR)/include
-	tar -ch -C $(LINUX_DIR)/include -f - linux | tar -xf - -C $(STAGING_DIR)/include/
-	tar -ch -C $(LINUX_DIR)/include -f - asm | tar -xf - -C $(STAGING_DIR)/include/
+$(STAGING_DIR)/usr/include/linux/version.h: $(LINUX_DIR)/.configured
+	mkdir -p $(STAGING_DIR)/usr/include
+	tar -ch -C $(LINUX_DIR)/include -f - linux | tar -xf - -C $(STAGING_DIR)/usr/include/
+	tar -ch -C $(LINUX_DIR)/include -f - asm | tar -xf - -C $(STAGING_DIR)/usr/include/
 
-linux: $(STAGING_DIR)/include/linux/version.h $(TARGET_DIR)/lib/modules/$(LINUX_VERSION)/modules.dep
+linux: $(STAGING_DIR)/usr/include/linux/version.h $(TARGET_DIR)/lib/modules/$(LINUX_VERSION)/modules.dep
 
 linux-source: $(DL_DIR)/$(LINUX_SOURCE)
 

target/device/jp/q5/linux.mk

@@ -109,12 +109,12 @@ $(TARGET_DIR)/lib/modules/$(LINUX_VERSION)/modules.dep: $(LINUX_KERNEL) cross-de
 		DEPMOD=$(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-depmod \
 		INSTALL_MOD_PATH=$(TARGET_DIR) modules_install
 
-$(STAGING_DIR)/include/linux/version.h: $(LINUX_DIR)/.configured
-	mkdir -p $(STAGING_DIR)/include
-	tar -ch -C $(LINUX_DIR)/include -f - linux | tar -xf - -C $(STAGING_DIR)/include/
-	tar -ch -C $(LINUX_DIR)/include -f - asm | tar -xf - -C $(STAGING_DIR)/include/
+$(STAGING_DIR)/usr/include/linux/version.h: $(LINUX_DIR)/.configured
+	mkdir -p $(STAGING_DIR)/usr/include
+	tar -ch -C $(LINUX_DIR)/include -f - linux | tar -xf - -C $(STAGING_DIR)/usr/include/
+	tar -ch -C $(LINUX_DIR)/include -f - asm | tar -xf - -C $(STAGING_DIR)/usr/include/
 
-linux: $(STAGING_DIR)/include/linux/version.h $(TARGET_DIR)/lib/modules/$(LINUX_VERSION)/modules.dep
+linux: $(STAGING_DIR)/usr/include/linux/version.h $(TARGET_DIR)/lib/modules/$(LINUX_VERSION)/modules.dep
 
 linux-source: $(DL_DIR)/$(LINUX_SOURCE)
 

toolchain/gdb/gdb.mk

@@ -157,7 +157,7 @@ $(GDB_SERVER_DIR)/.configured: $(GDB_DIR)/.unpacked
 		--localstatedir=/var \
 		--mandir=/usr/man \
 		--infodir=/usr/info \
-		--includedir=$(STAGING_DIR)/include \
+		--includedir=$(STAGING_DIR)/usr/include \
 		$(DISABLE_NLS) \
 		--without-uiout $(DISABLE_GDBMI) \
 		--disable-tui --disable-gdbtk --without-x \

toolchain/uClibc/uclibc.mk

@@ -280,13 +280,13 @@ $(UCLIBC_DIR)/.configured: $(UCLIBC_DIR)/.oldconfig
 		HOSTCC="$(HOSTCC)" \
 		pregen install_dev
 	# Install the kernel headers to the first stage gcc include dir if necessary
-ifeq ($(LINUX_HEADERS_IS_KERNEL),y)	
+ifeq ($(LINUX_HEADERS_IS_KERNEL),y)
 	if [ ! -f $(TOOL_BUILD_DIR)/uClibc_dev/usr/include/linux/version.h ] ; \
 	then \
 		cp -pLR $(LINUX_HEADERS_DIR)/include/* $(TOOL_BUILD_DIR)/uClibc_dev/usr/include/ ; \
 	fi
 else
-	if [ ! -f $(STAGING_DIR)/include/linux/version.h ] ; then \
+	if [ ! -f $(STAGING_DIR)/usr/include/linux/version.h ] ; then \
 		cp -pLR $(LINUX_HEADERS_DIR)/include/asm $(TOOL_BUILD_DIR)/uClibc_dev/usr/include/ ; \
 		cp -pLR $(LINUX_HEADERS_DIR)/include/linux $(TOOL_BUILD_DIR)/uClibc_dev/usr/include/ ; \
 		if [ -d $(LINUX_HEADERS_DIR)/include/asm-generic ] ; then \
@@ -332,7 +332,7 @@ else
 		install_runtime install_dev
 endif
 	# Install the kernel headers to the staging dir if necessary
-ifeq ($(LINUX_HEADERS_IS_KERNEL),y)	
+ifeq ($(LINUX_HEADERS_IS_KERNEL),y)
 	if [ ! -f $(STAGING_DIR)/usr/include/linux/version.h ] ; then \
 		cp -pLR $(LINUX_HEADERS_DIR)/include/* $(STAGING_DIR)/usr/include/ ; \
 	fi
@@ -417,7 +417,7 @@ $(TARGET_DIR)/usr/lib/libc.a: $(STAGING_DIR)/usr/lib/libc.a
 		RUNTIME_PREFIX=/ \
 		install_dev
 	# Install the kernel headers to the target dir if necessary
-ifeq ($(LINUX_HEADERS_IS_KERNEL),y)	
+ifeq ($(LINUX_HEADERS_IS_KERNEL),y)
 	if [ ! -f $(TARGET_DIR)/usr/include/linux/version.h ] ; \
 	then \
 		cp -pLR $(LINUX_HEADERS_DIR)/include/* $(TARGET_DIR)/usr/include/ ; \