From 8bbd72c283526c54ada126120063cb60b887ec17 Mon Sep 17 00:00:00 2001
From: Wade Berrier <wade@mono-cvs.ximian.com>
Date: Mon, 17 Dec 2007 23:20:22 +0000
Subject: Backport 91492, 91496, 91502

svn path=/branches/monodevelop/extras/BooBinding/1.0/; revision=91503
---
 extras/BooBinding/BooBinding.make   |  6 +++---
 extras/BooBinding/BooShell/Makefile |  2 +-
 extras/BooBinding/Makefile          | 12 ++++++------
 extras/BooBinding/po/Makefile       |  7 ++-----
 4 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/extras/BooBinding/BooBinding.make b/extras/BooBinding/BooBinding.make
index aa7bf13c42..f6df998df2 100644
--- a/extras/BooBinding/BooBinding.make
+++ b/extras/BooBinding/BooBinding.make
@@ -34,7 +34,7 @@ BUILD_DIR = build
 
 endif
 
-INSTALL_DIR = $(prefix)/lib/monodevelop/AddIns/BooBinding
+INSTALL_DIR = $(DESTDIR)$(prefix)/lib/monodevelop/AddIns/BooBinding
 
 LINUX_PKGCONFIG = \
 	$(BOOBINDING_PC)  
@@ -140,8 +140,8 @@ install-local: $(ASSEMBLY) $(ASSEMBLY_MDB) $(BOOBINDING_PC)
 	make pre-install-local-hook prefix=$(prefix)
 	mkdir -p $(INSTALL_DIR)
 	cp $(ASSEMBLY) $(ASSEMBLY_MDB) $(INSTALL_DIR)
-	mkdir -p $(prefix)/lib/pkgconfig
-	test -z '$(BOOBINDING_PC)' || cp $(BOOBINDING_PC) $(prefix)/lib/pkgconfig
+	mkdir -p $(DESTDIR)$(prefix)/lib/pkgconfig
+	test -z '$(BOOBINDING_PC)' || cp $(BOOBINDING_PC) $(DESTDIR)$(prefix)/lib/pkgconfig
 	make post-install-local-hook prefix=$(prefix)
 
 uninstall-local: $(ASSEMBLY) $(ASSEMBLY_MDB) $(BOOBINDING_PC)
diff --git a/extras/BooBinding/BooShell/Makefile b/extras/BooBinding/BooShell/Makefile
index 8eb7c55239..9363c421b7 100644
--- a/extras/BooBinding/BooShell/Makefile
+++ b/extras/BooBinding/BooShell/Makefile
@@ -35,7 +35,7 @@ BUILD_DIR = ../build
 
 endif
 
-INSTALL_DIR = $(prefix)/lib/monodevelop/AddIns/BooBinding
+INSTALL_DIR = $(DESTDIR)$(prefix)/lib/monodevelop/AddIns/BooBinding
 
 FILES = \
 	BooShell.boo 
diff --git a/extras/BooBinding/Makefile b/extras/BooBinding/Makefile
index 9144e1e05f..6c7582311a 100644
--- a/extras/BooBinding/Makefile
+++ b/extras/BooBinding/Makefile
@@ -26,14 +26,14 @@ CONFIG_MAKE=$(top_srcdir)/config.make
 	@set . $$MAKEFLAGS; final_exit=:; \
 	case $$2 in --unix) shift ;; esac; \
 	case $$2 in *=*) dk="exit 1" ;; *k*) dk=: ;; *) dk="exit 1" ;; esac; \
-	make pre-$*-hook prefix=$(prefix)
+	make pre-$*-hook prefix=$(prefix) ; \
 	for dir in $(SUBDIRS); do \
 		case $$dir in \
 		.) make $*-local || { final_exit="exit 1"; $$dk; };;\
 		*) (cd $$dir && make $*) || { final_exit="exit 1"; $$dk; };;\
 		esac \
-	done
-	make post-$*-hook prefix=$(prefix)
+	done; \
+	make post-$*-hook prefix=$(prefix) ; \
 	$$final_exit
 
 $(CONFIG_MAKE):
@@ -67,7 +67,7 @@ dist: $(CONFIG_MAKE)
 
 distcheck: dist
 	(mkdir test; cd test;  \
-	 tar xzvf ../$(PACKAGE)-$(VERSION).tar.gz; cd $(PACKAGE)-$(VERSION); \
-	 ./configure --prefix=$$(cd `pwd`/..; pwd); \
-	 make && make install && make dist);
+	tar xzvf ../$(PACKAGE)-$(VERSION).tar.gz; cd $(PACKAGE)-$(VERSION); \
+	./configure --prefix=$$(cd `pwd`/..; pwd); \
+	make && make install && make dist);
 	rm -rf test
diff --git a/extras/BooBinding/po/Makefile b/extras/BooBinding/po/Makefile
index f3e1e46865..00e8597ec3 100644
--- a/extras/BooBinding/po/Makefile
+++ b/extras/BooBinding/po/Makefile
@@ -1,7 +1,4 @@
 
-EXTRA_DIST = Makefile
-
-
 # Warning: This is an automatically generated file, do not edit!
 
 srcdir=.
@@ -12,7 +9,7 @@ include $(top_srcdir)/config.make
 
 MDTOOL = $(LOCAL_PKGCONFIG) mono `$(LOCAL_PKGCONFIG) pkg-config --variable=libdir monodevelop`/bin/mdrun.exe
 BUILD_DIR = ../build/locale
-INSTALL_DIR = $(prefix)/lib/monodevelop/AddIns/BooBinding/locale
+INSTALL_DIR = $(DESTDIR)$(prefix)/lib/monodevelop/AddIns/BooBinding/locale
 
 FILES = \
 	ca.po\
@@ -53,7 +50,7 @@ $(MO_FILES): $(INSTALL_DIR)/%/LC_MESSAGES/$(PACKAGE).mo : $(BUILD_DIR)/%/LC_MESS
 install-local: $(MO_FILES)
 
 CLEANFILES = $(GMO_FILES)
-EXTRA_DIST = Makefile
+EXTRA_DIST = Makefile $(FILES)
 install: install-local
 uninstall: uninstall-local
 clean: clean-local
-- 
cgit v1.2.3