Mercurial > mxe-octave
diff src/libgpg_error.mk @ 2997:4f9b72cf7ee7
allow native builds too
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 28 May 2013 17:31:59 -0400 |
parents | b40c2cbbcb88 |
children | 14a434dcf672 |
line wrap: on
line diff
--- a/src/libgpg_error.mk Sun May 26 13:32:22 2013 -0400 +++ b/src/libgpg_error.mk Tue May 28 17:31:59 2013 -0400 @@ -17,20 +17,13 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ + $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ --host='$(TARGET)' \ --build="`config.guess`" \ - --enable-static --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-nls \ --disable-languages $(MAKE) -C '$(1)/src' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= $(MAKE) -C '$(1)/src' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= - if [ "$(BUILD_SHARED)" = yes ]; then \ - $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(PREFIX)/$(TARGET)/lib/libgpg-error.a'; \ - $(INSTALL) -d '$(PREFIX)/$(TARGET)/bin/'; \ - $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libgpg-error.dll.a' '$(PREFIX)/$(TARGET)/lib/libgpg-error.dll.a'; \ - $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libgpg-error.dll' '$(PREFIX)/$(TARGET)/bin/libgpg-error.dll'; \ - rm -f '$(PREFIX)/$(TARGET)/lib/libgpg-error.dll'; \ - rm -f '$(PREFIX)/$(TARGET)/lib/libgpg-error.la'; \ - fi endef