diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-05-13 11:53:01 -0500 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-05-13 17:08:30 +0000 |
| commit | 9b9ee3d5e2f2e45b0c94b631649ae13cdbc1f0c3 (patch) | |
| tree | be800a9745cc8fcabdedfca861f92d7d3864070d | |
| parent | 10ab5bbfec449973ed8fbb77607f0a1aec2c950f (diff) | |
dev-install: create the 'install' link in the builddir not in the srcdir
Change-Id: I9d1e7ac746928c2a793ac05d932af60d0c8edc06
Reviewed-on: https://gerrit.libreoffice.org/3887
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
| -rw-r--r-- | Makefile.in | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index 68ac28c2631c..26a00ad58f09 100644 --- a/Makefile.in +++ b/Makefile.in @@ -316,7 +316,7 @@ else @ooinstall -l $(DEVINSTALLDIR)/opt endif endif - @rm -f $(SRCDIR)/install && ln -s $(DEVINSTALLDIR)/opt/ $(SRCDIR)/install + @rm -f $(BUILDDIR)/install && ln -s $(DEVINSTALLDIR)/opt/ $(BUILDDIR)/install @echo @echo "If you want to edit the .ui files with glade first execute:" @echo @@ -325,12 +325,12 @@ ifeq ($(OS),LINUX) @echo @echo "Developer installation finished, you can now execute:" @echo - @echo "$(SRCDIR)/install/program/soffice" + @echo "$(BUILDDIR)/install/program/soffice" else ifeq ($(OS),MACOSX) @echo @echo "Developer installation finished, you can now run:" @echo - @echo " open $(SRCDIR)/install/LibreOffice.app" + @echo " open $(BUILDDIR)/install/LibreOffice.app" @echo @echo "To debug: gdb install/LibreOffice.app/Contents/MacOS/soffice" endif @@ -338,6 +338,7 @@ 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) @@ -354,7 +355,7 @@ else @ooinstall $(DEVINSTALLDIR)/opt @install-gdb-printers endif - @rm -f $(SRCDIR)/install && ln -s $(DEVINSTALLDIR)/opt/ $(SRCDIR)/install + @rm -f $(BUILDDIR)/install && ln -s $(DEVINSTALLDIR)/opt/ $(BUILDDIR)/install distro-pack-install: install $(SRCDIR)/bin/distro-install-clean-up |