Mercurial > mxe-octave

changeset 4308:411ddca4207f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More dont install dependancy docs * src/tiff.mk: add MXE_DISABLE_DOCS to install * Makefile.in: add dist_manX_MANS targets to MXE_DISABLE_DOCS * src/pcre.mk: remove html and man pages from installed files * src/libssh2.mk: add MXE_DISABLE_DOCS to install
author John D
date Sat, 31 Dec 2016 09:54:08 -0500
parents d15e1b63b01f
children 7384a91ed38a
files Makefile.in src/libssh2.mk src/pcre.mk src/tiff.mk
diffstat 4 files changed, 13 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.in	Sat Dec 31 09:03:07 2016 -0500
+++ b/Makefile.in	Sat Dec 31 09:54:08 2016 -0500
@@ -162,12 +162,15 @@
 ifeq ($(ENABLE_DEP_DOCS),no)
   MXE_DISABLE_DOCS := \
     man_MANS= \
+    dist_man_MANS= \
     man1_MANS= \
+    dist_man1_MANS= \
     man2_MANS= \
     man3_MANS= \
+    dist_man3_MANS= \
     man4_MANS= \
     man5_MANS= \
-    dist_man_MANS= \
+    dist_man5_MANS= \
     doc_DATA= \
     dist_doc_DATA= \
     html_DATA= \
--- a/src/libssh2.mk	Sat Dec 31 09:03:07 2016 -0500
+++ b/src/libssh2.mk	Sat Dec 31 09:54:08 2016 -0500
@@ -28,7 +28,7 @@
         --without-openssl \
         --with-libgcrypt \
         PKG_CONFIG='$(MXE_PKG_CONFIG)' && $(CONFIGURE_POST_HOOK)
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= html_DATA= DESTDIR='$(3)'
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install $(MXE_DISABLE_PROGS) $(MXE_DISABLE_DOCS) DESTDIR='$(3)'
 
 ##    '$(MXE_CC)' \
 ##        -W -Wall -Werror -ansi -pedantic \
--- a/src/pcre.mk	Sat Dec 31 09:03:07 2016 -0500
+++ b/src/pcre.mk	Sat Dec 31 09:54:08 2016 -0500
@@ -33,7 +33,12 @@
         --disable-pcregrep-libbz2 \
         --disable-pcretest-libreadline && $(CONFIGURE_POST_HOOK)
     rm -f '$(HOST_PREFIX)'/share/man/man3/pcre16*.3
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= DESTDIR='$(3)'
+    $(MAKE) -C '$(1)' -j '$(JOBS)' $(MXE_DISABLE_PROGS) DESTDIR='$(3)'
+    $(MAKE) -C '$(1)' -j 1 install $(MXE_DISABLE_PROGS) DESTDIR='$(3)'
+    if [ "$(ENABLE_DEP_DOCS)" == "no" ]; then \
+       rm -rf "$(3)$(HOST_PREFIX)/share/doc/pcre/html"; \
+       rm -rf "$(3)$(HOST_PREFIX)/share/man"; \
+    fi
     if [ $(MXE_NATIVE_BUILD) = no ]; then \
       $(INSTALL) -d '$(3)$(BUILD_TOOLS_PREFIX)/bin'; \
       $(INSTALL) -m755 '$(3)$(HOST_BINDIR)/pcre-config' '$(3)$(BUILD_TOOLS_PREFIX)/bin/pcre-config'; \
--- a/src/tiff.mk	Sat Dec 31 09:03:07 2016 -0500
+++ b/src/tiff.mk	Sat Dec 31 09:54:08 2016 -0500
@@ -27,7 +27,8 @@
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --without-x && $(CONFIGURE_POST_HOOK)
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= DESTDIR='$(3)'
+    $(MAKE) -C '$(1)' -j '$(JOBS)' $(MXE_DISABLE_PROGS) DESTDIR='$(3)'
+    $(MAKE) -C '$(1)' -j 1 install $(MXE_DISABLE_PROGS) $(MXE_DISABLE_DOCS) DESTDIR='$(3)'
 
     rm -f '$(3)$(HOST_LIBDIR)/libtiff.la'
     rm -f '$(3)$(HOST_LIBDIR)/libtiffxx.la'