diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-09-17 13:56:12 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-09-17 19:37:42 +0200 |
| commit | f5b840a3ee14a2086647596246d3491a58bf33bb (patch) | |
| tree | 84b5b61340679be7d7929583090b3463651cdeee /Makefile.in | |
| parent | bb15aeb0bbd063e557f21c4edde03949c66173fd (diff) | |
goodbye linkoo.. you have served well
This commit:
- removes linkoo and --disable-linkoo option
- removes 'dev-update' make target
- creates --disable-ooenv option
- removes LD_LIBRARY_PATH and PATH settings in ooenv
Change-Id: I9530558531e9cb58b8282754ec8a6c655f190480
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/Makefile.in b/Makefile.in index 5598af47963c..da2beb20adf6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -271,7 +271,6 @@ dev-install: build ifeq ($(OS_FOR_BUILD),WNT) cd $(SRCDIR)/instsetoo_native && $(GNUMAKE) LIBO_DEV_INSTALL=TRUE $(GMAKE_OPTIONS) else -ifeq ($(DISABLE_LINKOO),TRUE) @ooinstall $(DEVINSTALLDIR)/opt ifneq ($(MACOSX_CODESIGNING_IDENTITY),) @macosx-codesign-app-bundle $(DEVINSTALLDIR)/opt/LibreOffice.app @@ -279,9 +278,6 @@ endif ifneq ($(OS),MACOSX) @install-gdb-printers -L endif -else - @ooinstall -l $(DEVINSTALLDIR)/opt -endif endif @rm -f $(BUILDDIR)/install && ln -s $(DEVINSTALLDIR)/opt/ $(BUILDDIR)/install @echo @@ -305,14 +301,6 @@ endif dev-install-nocheck: build-nocheck $(MAKE) dev-install -o build -# FIXME: shouldn't linkoo be BUILDDIR vs SRCDIR aware ? -dev-update: -ifeq ($(DISABLE_LINKOO),TRUE) - @linkoo --copy $(DEVINSTALLDIR)/opt $(SRCDIR) -else - @linkoo $(DEVINSTALLDIR)/opt $(SRCDIR) -endif - install-tb: @rm -rf $(DEVINSTALLDIR) @mkdir $(DEVINSTALLDIR) |