summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2010-12-05 16:12:01 -0500
committerColin Walters <walters@verbum.org>2010-12-05 16:12:31 -0500
commit1c0bc7fc61c7004b98d18a7b527652ad360391f1 (patch)
tree2a00cd691b5f99ad2740e68a7da50207107f603e
parent00ddbcf3dbb22b122744adaf023c23f6aa639e21 (diff)
downloadhomegit-MOVED-TO-GNOME-1c0bc7fc61c7004b98d18a7b527652ad360391f1.zip
homegit-MOVED-TO-GNOME-1c0bc7fc61c7004b98d18a7b527652ad360391f1.tar.gz
homegit-MOVED-TO-GNOME-1c0bc7fc61c7004b98d18a7b527652ad360391f1.tar.xz
inroot: Set PKG_CONFIG_PATH to include ${root}/share too
Software puts files in both. Also only specify ACLOCAL_FLAGS if the root exists (since aclocal bombs out otherwise). And clean up the indentation so it's easier to read.
-rwxr-xr-xbin/inroot13
-rwxr-xr-xbin/inroot~9
2 files changed, 12 insertions, 10 deletions
diff --git a/bin/inroot b/bin/inroot
index ab18424..8688999 100755
--- a/bin/inroot
+++ b/bin/inroot
@@ -13,4 +13,15 @@ if test -d /lib64; then
else
libext=
fi
-exec env INROOT_DIR=${root} ACLOCAL_FLAGS="-I ${root}/share/aclocal $ACLOCAL_FLAGS" XDG_DATA_DIRS=${root}/share:/usr/share LD_LIBRARY_PATH=${root}/lib${libext} PATH=${root}/bin:${PATH} PKG_CONFIG_PATH=${root}/lib${libext}/pkgconfig PYTHONPATH=${root}/lib${libext}/python2.5/site-packages "$@"
+if test -d "${root}/share/aclocal"; then
+ ACLOCAL_FLAGS="-I ${root}/share/aclocal"
+ export ACLOCAL_FLAGS
+fi
+exec env \
+ INROOT_DIR=${root} \
+ XDG_DATA_DIRS=${root}/share:/usr/share \
+ LD_LIBRARY_PATH=${root}/lib${libext} \
+ PATH=${root}/bin:${PATH} \
+ PKG_CONFIG_PATH=${root}/lib${libext}/pkgconfig:${root}/share/pkgconfig \
+ PYTHONPATH=${root}/lib${libext}/python2.5/site-packages \
+ "$@"
diff --git a/bin/inroot~ b/bin/inroot~
deleted file mode 100755
index 3903ad7..0000000
--- a/bin/inroot~
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-root=$1
-shift
-if test -d /lib64; then
- libext=64
-else
- libext=
-fi
-exec env INROOT_DIR=${root} XDG_DATA_DIRS=${root}/share LD_LIBRARY_PATH=${root}/lib${libext} PATH=${root}/bin:${PATH} PKG_CONFIG_PATH=${root}/lib${libext}/pkgconfig PYTHONPATH=${root}/lib${libext}/python2.5/site-packages "$@"