From 63129f9b4c90013989b7e4bd5689b558dd218d27 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 22 Apr 2009 22:05:55 +0000
Subject: clean up automake/pkg-config handling, move separate host/package
 variable exports to templates, fix automake path for host builds

SVN-Revision: 15339
---
 tools/automake/files/aclocal      | 10 +---------
 tools/pkg-config/files/pkg-config |  2 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

(limited to 'tools')

diff --git a/tools/automake/files/aclocal b/tools/automake/files/aclocal
index 60278e2ab0..a60df10c42 100755
--- a/tools/automake/files/aclocal
+++ b/tools/automake/files/aclocal
@@ -1,10 +1,2 @@
 #!/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 $@
+aclocal.real $ACLOCAL_INCLUDE $@
diff --git a/tools/pkg-config/files/pkg-config b/tools/pkg-config/files/pkg-config
index a3d73700f9..8e017fb45b 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=prefix=${STAGING_DIR}/usr/ --define-variable=exec_prefix=${STAGING_DIR}/usr/
+pkg-config.real $@ --define-variable=prefix=${STAGING_PREFIX}/ --define-variable=exec_prefix=${STAGING_PREFIX}/
-- 
cgit v1.2.3