From 782f8b8b432c0e96ef59c687a771582e677e2818 Mon Sep 17 00:00:00 2001 From: Michael Hutchinson Date: Tue, 15 Feb 2011 17:58:45 -0500 Subject: Use libs in $prefix for build and run --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index edd6a7fe29..0f88dae7b5 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,9 @@ include $(top_srcdir)/config.make CONFIG_MAKE=$(top_srcdir)/config.make %-recursive: $(CONFIG_MAKE) - @set . $$MAKEFLAGS; final_exit=:; \ + @export PKG_CONFIG_PATH="`pwd`/$(top_srcdir)/local-config:$(prefix)/lib/pkgconfig:$(prefix)/share/pkgconfig:$$PKG_CONFIG_PATH"; \ + export MONO_GAC_PREFIX="$(prefix)/lib/pkgconfig:$(prefix)/share/pkgconfig:$$MONO_GAC_PREFIX"; \ + set . $$MAKEFLAGS; final_exit=:; \ case $$2 in --unix) shift ;; esac; \ case $$2 in *=*) dk="exit 1" ;; *k*) dk=: ;; *) dk="exit 1" ;; esac; \ for dir in $(SUBDIRS); do \ @@ -21,7 +23,7 @@ CONFIG_MAKE=$(top_srcdir)/config.make $$final_exit $(CONFIG_MAKE): $(top_srcdir)/configure - @if test -e "$(CONFIG_MAKE)"; then exec $(top_srcdir)/configure; \ + @if test -e "$(CONFIG_MAKE)"; then exec $(top_srcdir)/configure --prefix=$(prefix); \ else \ echo "You must run configure first"; \ exit 1; \ -- cgit v1.2.3