comparison Makefile.in @ 4533:f3fb203b6fca

Makefile.in: Also set CPPFLAGS and LDFLAGS in the environemt for pkg-install.py
author John W. Eaton <jwe@octave.org>
date Sat, 11 Nov 2017 08:30:36 -0500
parents 8f9bee27223f
children 23a905c6f5d3
comparison
equal deleted inserted replaced
4532:2ef6a1cbd7df 4533:f3fb203b6fca
744 && tar cvfz $($(PKG)_FILE) $($(PKG)_SUBDIR) \ 744 && tar cvfz $($(PKG)_FILE) $($(PKG)_SUBDIR) \
745 && $(INSTALL) -m644 '$($(PKG)_FILE)' '$(3)$(HOST_PREFIX)/src'; \ 745 && $(INSTALL) -m644 '$($(PKG)_FILE)' '$(3)$(HOST_PREFIX)/src'; \
746 else \ 746 else \
747 cd '$(1)/..' && \ 747 cd '$(1)/..' && \
748 tar cfz $($(PKG)_FILE) $($(PKG)_SUBDIR) && \ 748 tar cfz $($(PKG)_FILE) $($(PKG)_SUBDIR) && \
749 OCTAVE_CONFIG=$(MXE_OCTAVECONFIG) TMP="$(1)/.." \ 749 OCTAVE_CONFIG=$(MXE_OCTAVECONFIG) TMP="$(1)/.." \
750 MKOCTFILE=$(MXE_MKOCTFILE) MAKE=$(MAKE) CONFIGURE_OPTIONS="$(HOST_AND_BUILD_CONFIGURE_OPTIONS)" $(4) \ 750 $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
751 $(TOP_DIR)/tools/pkg-install.py -verbose "$($(PKG)_FILE)"; \ 751 MKOCTFILE=$(MXE_MKOCTFILE) MAKE=$(MAKE) \
752 CONFIGURE_OPTIONS="$(HOST_AND_BUILD_CONFIGURE_OPTIONS)" $(4) \
753 $(TOP_DIR)/tools/pkg-install.py -verbose "$($(PKG)_FILE)"; \
752 fi 754 fi
753 endef 755 endef
754 endif 756 endif
755 757
756 define PKG_RULE 758 define PKG_RULE