diff options
Diffstat (limited to 'Makefile.distrib')
| -rw-r--r-- | Makefile.distrib | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/Makefile.distrib b/Makefile.distrib index 0a8c029fe4..8ece061df4 100644 --- a/Makefile.distrib +++ b/Makefile.distrib @@ -79,11 +79,11 @@ INSTALL_PACKAGE = $(PROJECT_NAME)-$(INSTALL_VERSION) INSTALL_PREFIX = $(INSTALL_ROOT)/$(INSTALL_PACKAGE) INSTALL_BINDIR = $(INSTALL_PREFIX)/bin INSTALL_SHAREDIR = $(INSTALL_PREFIX)/share -INSTALL_SRCDIR = $(INSTALL_PREFIX)/src/$(INSTALL_PACKAGE) -INSTALL_MANDIR = $(INSTALL_SHAREDIR)/man/man1 +INSTALL_MANDIR = $(INSTALL_SHAREDIR)/man INSTALL_DOCDIR = $(INSTALL_SHAREDIR)/doc/$(INSTALL_PACKAGE) INSTALL_PACKAGEDIR = $(INSTALL_SHAREDIR)/$(INSTALL_PACKAGE) INSTALL_LIBDIR = $(INSTALL_PACKAGEDIR)/lib +INSTALL_SRCDIR = $(INSTALL_PACKAGEDIR)/src INSTALL_SUPPORTDIR = $(INSTALL_PACKAGEDIR)/support INSTALL_TESTDIR = $(INSTALL_PACKAGEDIR)/test INSTALL_APIDOCDIR = $(INSTALL_DOCDIR)/api @@ -144,7 +144,9 @@ install : $(TOOLS_JAR_ARCHIVE) LIBRARY_SDC_OUTPUTDIR=$(INSTALL_APIDOCDIR) \ sdc $(INSTALL) -m 755 -d $(INSTALL_MANDIR) - $(INSTALL) -m 644 -p $(MANPAGES_FILES) $(INSTALL_MANDIR) + $(INSTALL) -m 755 -d $(INSTALL_MANDIR)/man1 + $(strip $(MIRROR) -m 644 -p -C $(MANPAGES_ROOT) $(MANPAGES_LIST) \ + $(INSTALL_MANDIR)/man1) $(FIND) $(INSTALL_MANDIR) -type f -exec $(GZIP) -f "{}" ";" $(INSTALL) -m 755 -d $(INSTALL_EXAMPLEDIR) $(strip $(MIRROR) -m 644 -p -C $(EXAMPLES_ROOT) $(EXAMPLES_LIST) \ @@ -233,6 +235,12 @@ install-windows : install $(FIND) $(INSTALL_EXAMPLEDIR) -type f -exec $(UNIX2DOS) "{}" ";" $(FIND) $(INSTALL_SUPPORTDIR) -type f -exec $(UNIX2DOS) "{}" ";" $(RM) -r $(INSTALL_TESTDIR) + $(MV) $(INSTALL_PACKAGEDIR)/* $(INSTALL_PREFIX) + $(INSTALL) -m 755 -d $(INSTALL_PREFIX)/doc + $(MV) $(INSTALL_DOCDIR)/api $(INSTALL_PREFIX)/doc + $(MV) $(INSTALL_DOCDIR)/*.pdf $(INSTALL_PREFIX)/doc + $(MV) $(INSTALL_DOCDIR)/* $(INSTALL_PREFIX) + $(RM) -r $(INSTALL_SHAREDIR) install-addons : $(RM) -r $(DISTRIB_ARCHIVE).addons @@ -254,13 +262,13 @@ IA_CONFIG_IMAGESDIR = $(IA_CONFIG_PREFIX)/images IA_CONFIG_LOCALESDIR = $(IA_CONFIG_PREFIX)/locales IA_CONFIG_CUSTOMCODEDIR = $(IA_CONFIG_PREFIX)/CustomCode -IA_XSLFILE = $(IA_CONFIG_PREFIX)/setversion.xsl +IA_XSLFILE = $(IA_CONFIG_PREFIX)/setversion.xsl IA_CUSTOMFILE = custom IA_LICENSEFILE = LICENSE IA_SPLASHFILE = $(IA_CONFIG_IMAGESDIR)/Splash.png IA_UNIX_PROJECTFILE = $(IA_CONFIG_PREFIX)/$(PROJECT_NAME)_unix.iap_xml -IA_WIN32_PROJECTFILE = $(IA_CONFIG_PREFIX)/$(PROJECT_NAME)_win32.iap_xml +IA_WIN32_PROJECTFILE = $(IA_CONFIG_PREFIX)/$(PROJECT_NAME)_win32.iap_xml IA_BUILD_PREFIX = /tmp/IA_Build_$(PROJECT_NAME) IA_BUILD_IMAGESDIR = $(IA_BUILD_PREFIX)/images @@ -329,7 +337,8 @@ ia-build-windows : done $(INSTALL) -m 644 -p $(IA_CONFIG_PREFIX)/tools.zip $(IA_BUILD_PREFIX) $(XSLTPROC) $(XSLTPROC_FLAGS) $(IA_WIN32_PROJECTFILE) > $(IA_BUILD_PROJECTFILE) - $(UNZIP) -q $(INSTALL_PREFIX).zip -d $(IA_BUILD_PREFIX) +# $(UNZIP) -q $(INSTALL_PREFIX).zip -d $(IA_BUILD_PREFIX) + $(UNZIP) -q $(DISTRIB_ARCHIVE).zip -d $(IA_BUILD_PREFIX) $(strip cd $(IA_BUILD_PREFIX)/$(PROJECT_NAME)-$(INSTALL_VERSION); \ $(ZIP) -q -r ../$(PROJECT_NAME).zip .) $(RM) -r $(IA_BUILD_PREFIX)/$(PROJECT_NAME)-$(INSTALL_VERSION) |