diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2012-04-24 08:57:49 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2012-04-24 09:01:47 +0200 |
| commit | 77f19d6e024006dac4434f60a377543314dbf261 (patch) | |
| tree | b72f827575e406ed79a2897307c3582b5004e323 /Makefile | |
| parent | 4af5efaaffba264d00109723e3ae33876bac4ae8 (diff) | |
specific variable for where dev-install installs
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -302,6 +302,7 @@ $(eval $(call dmake_modules_rules,$(dmake_modules))) clean: clean-host clean-build clean-host: + rm -fr $(DEVINSTALLDIR) rm -fr $(SRCDIR)/*/$(INPATH) rm -fr install @@ -431,15 +432,15 @@ install: echo "$(INSTALLDIR)/program/soffice" dev-install: build - @rm -rf $(OUTDIR)/installation - @mkdir $(OUTDIR)/installation + @rm -rf $(DEVINSTALLDIR) + @mkdir $(DEVINSTALLDIR) ifeq ($(DISABLE_LINKOO),TRUE) - @ooinstall $(OUTDIR)/installation/opt + @ooinstall $(DEVINSTALLDIR)/opt @install-gdb-printers -L else - @ooinstall -l $(OUTDIR)/installation/opt + @ooinstall -l $(DEVINSTALLDIR)/opt endif - @rm -f $(SRCDIR)/install && ln -s $(OUTDIR)/installation/opt/ $(SRCDIR)/install + @rm -f $(SRCDIR)/install && ln -s $(DEVINSTALLDIR)/opt/ $(SRCDIR)/install distro-pack-install: install $(SRCDIR)/bin/distro-install-clean-up |