diff options
| author | Wade Berrier <wade@mono-cvs.ximian.com> | 2007-12-18 02:28:52 +0300 |
|---|---|---|
| committer | Wade Berrier <wade@mono-cvs.ximian.com> | 2007-12-18 02:28:52 +0300 |
| commit | ed2e5428284055c1524c8722a3603f2fdf2b2d50 (patch) | |
| tree | c8f9f1743d6787cac6ff344d6163c4b40d35556a | |
| parent | 1b406ca5cd818be6f897a45785466b93397800e1 (diff) | |
Backport 91474, 91493, 91496, 91502extras/JavaBinding/0.18
svn path=/branches/monodevelop/extras/JavaBinding/1.0/; revision=91505
| -rw-r--r-- | extras/JavaBinding/JavaBinding.make | 6 | ||||
| -rw-r--r-- | extras/JavaBinding/Makefile | 6 | ||||
| -rw-r--r-- | extras/JavaBinding/po/Makefile | 7 |
3 files changed, 8 insertions, 11 deletions
diff --git a/extras/JavaBinding/JavaBinding.make b/extras/JavaBinding/JavaBinding.make index b6acc69683..1b77b2adfe 100644 --- a/extras/JavaBinding/JavaBinding.make +++ b/extras/JavaBinding/JavaBinding.make @@ -32,7 +32,7 @@ BUILD_DIR = build endif -INSTALL_DIR = $(prefix)/lib/monodevelop/AddIns/JavaBinding +INSTALL_DIR = $(DESTDIR)$(prefix)/lib/monodevelop/AddIns/JavaBinding LINUX_PKGCONFIG = \ $(JAVABINDING_PC) @@ -129,8 +129,8 @@ install-local: $(ASSEMBLY) $(ASSEMBLY_MDB) $(JAVABINDING_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 '$(JAVABINDING_PC)' || cp $(JAVABINDING_PC) $(prefix)/lib/pkgconfig + mkdir -p $(DESTDIR)$(prefix)/lib/pkgconfig + test -z '$(JAVABINDING_PC)' || cp $(JAVABINDING_PC) $(DESTDIR)$(prefix)/lib/pkgconfig make post-install-local-hook prefix=$(prefix) uninstall-local: $(ASSEMBLY) $(ASSEMBLY_MDB) $(JAVABINDING_PC) diff --git a/extras/JavaBinding/Makefile b/extras/JavaBinding/Makefile index 3ddd023b65..f65dab994c 100644 --- a/extras/JavaBinding/Makefile +++ b/extras/JavaBinding/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): diff --git a/extras/JavaBinding/po/Makefile b/extras/JavaBinding/po/Makefile index 48e41efcb9..e3627ae9c1 100644 --- a/extras/JavaBinding/po/Makefile +++ b/extras/JavaBinding/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/JavaBinding/locale +INSTALL_DIR = $(DESTDIR)$(prefix)/lib/monodevelop/AddIns/JavaBinding/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 |