Mercurial > mxe-octave

comparison src/zlib.mk @ 3109:98e1ed7ae70b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert part of d89eccc2edd3, it's prevent installation of headers and .pc files.
author Michael Goffioul <michael.goffioul@gmail.com>
date Sat, 29 Jun 2013 14:56:27 -0400
parents d89eccc2edd3
children 50a4de42ba1e
comparison
equal deleted inserted replaced
3108:acee522701c0 3109:98e1ed7ae70b
19 ifeq ($(MXE_NATIVE_MINGW_BUILD),yes) 19 ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
20 define $(PKG)_BUILD 20 define $(PKG)_BUILD
21 cd '$(1)' && CC='$(MXE_CC)' ./configure \ 21 cd '$(1)' && CC='$(MXE_CC)' ./configure \
22 --prefix='$(HOST_PREFIX)' 22 --prefix='$(HOST_PREFIX)'
23 23
24 $(MAKE) -C '$(1)' -j '$(JOBS)' 24 $(MAKE) -C '$(1)' -j '$(JOBS)' install
25 25
26 if [ "$(BUILD_STATIC)" = yes ]; then \ 26 if [ "$(BUILD_STATIC)" != yes ]; then \
27 $(MAKE) -C '$(1)' -j '$(JOBS)' install; \ 27 true; \
28 fi 28 fi
29 29
30 if [ "$(BUILD_SHARED)" = yes ]; then \ 30 if [ "$(BUILD_SHARED)" = yes ]; then \
31 $(MAKE_SHARED_FROM_STATIC) --ar '$(MXE_AR)' --ld '$(MXE_CC)' '$(1)/libz.a' --install '$(INSTALL)' --libdir '$(HOST_LIBDIR)' --bindir '$(HOST_BINDIR)'; \ 31 $(MAKE_SHARED_FROM_STATIC) --ar '$(MXE_AR)' --ld '$(MXE_CC)' '$(1)/libz.a' --install '$(INSTALL)' --libdir '$(HOST_LIBDIR)' --bindir '$(HOST_BINDIR)'; \
32 fi 32 fi