From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 11 Oct 2008 11:02:23 +0000 (+0000)
Subject: merge build system changes from trunk to 8.09
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=292e816bd7ecb51edf629cebfb512a2f31681ebf

merge build system changes from trunk to 8.09

SVN-Revision: 12952
---

diff --git a/package/libnl/patches/150-fix-libnl-pc-config.patch b/package/libnl/patches/150-fix-libnl-pc-config.patch
new file mode 100644
index 0000000000..ccdbc355a8
--- /dev/null
+++ b/package/libnl/patches/150-fix-libnl-pc-config.patch
@@ -0,0 +1,13 @@
+diff --git a/libnl-1.pc.in b/libnl-1.pc.in
+index 7ac8413..66a7cd9 100644
+--- a/libnl-1.pc.in
++++ b/libnl-1.pc.in
+@@ -1,7 +1,7 @@
+ prefix=@prefix@
+ exec_prefix=@prefix@
+ libdir=@libdir@
+-includedir=@prefix@/include
++includedir=@includedir@
+ 
+ Name: libnl
+ Description: Convenience library for netlink sockets
diff --git a/tools/automake/Makefile b/tools/automake/Makefile
index cf39cbda8b..2b8a6f3450 100644
--- a/tools/automake/Makefile
+++ b/tools/automake/Makefile
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2006 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -27,6 +27,9 @@ endef
 
 define Build/Install
 	$(MAKE) -C $(PKG_BUILD_DIR) install
+	mv $(STAGING_DIR_HOST)/bin/aclocal $(STAGING_DIR_HOST)/bin/aclocal.real
+	$(INSTALL_BIN) ./files/aclocal $(STAGING_DIR_HOST)/bin
+	ln -f $(STAGING_DIR_HOST)/bin/aclocal $(STAGING_DIR_HOST)/bin/aclocal-1.9
 endef
 
 define Build/Clean
diff --git a/tools/automake/files/aclocal b/tools/automake/files/aclocal
new file mode 100644
index 0000000000..60278e2ab0
--- /dev/null
+++ b/tools/automake/files/aclocal
@@ -0,0 +1,10 @@
+#!/usr/bin/env sh
+if [ -d ${STAGING_DIR}/host/share/aclocal ]; then
+    aclocal_include_dirs="-I ${STAGING_DIR}/host/share/aclocal"
+else
+    aclocal_include_dirs=
+fi
+if [ -d ${STAGING_DIR}/usr/share/aclocal ]; then
+    aclocal_include_dirs="$aclocal_include_dirs -I ${STAGING_DIR}/usr/share/aclocal"
+fi
+aclocal.real $aclocal_include_dirs $@
diff --git a/tools/pkg-config/files/pkg-config b/tools/pkg-config/files/pkg-config
index 31cfd0d83d..a3d73700f9 100755
--- a/tools/pkg-config/files/pkg-config
+++ b/tools/pkg-config/files/pkg-config
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-pkg-config.real $@ --define-variable=libdir=${STAGING_DIR}/usr/lib --define-variable=includedir=${STAGING_DIR}/usr/include
+pkg-config.real $@ --define-variable=prefix=${STAGING_DIR}/usr/ --define-variable=exec_prefix=${STAGING_DIR}/usr/