Mercurial > mxe-octave
diff src/termcap.mk @ 2997:4f9b72cf7ee7
allow native builds too
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 28 May 2013 17:31:59 -0400 |
| parents | 1122ae1e98b6 |
| children | 100e618349f7 |
line wrap: on
line diff
--- a/src/termcap.mk Sun May 26 13:32:22 2013 -0400 +++ b/src/termcap.mk Tue May 28 17:31:59 2013 -0400 @@ -17,6 +17,7 @@ define $(PKG)_BUILD cd '$(1)' && autoreconf cd '$(1)' && ./configure \ + $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ --host='$(TARGET)' \ --prefix='$(PREFIX)/$(TARGET)' \ AR=$(TARGET)-ar @@ -24,10 +25,6 @@ $(MAKE) AR=$(TARGET)-ar -C '$(1)' -j '$(JOBS)' install if [ "$(BUILD_SHARED)" = yes ]; then \ - $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(PREFIX)/$(TARGET)/lib/libtermcap.a'; \ - $(INSTALL) -d '$(PREFIX)/$(TARGET)/bin/'; \ - $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libtermcap.dll.a' '$(PREFIX)/$(TARGET)/lib/libtermcap.dll.a'; \ - $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libtermcap.dll' '$(PREFIX)/$(TARGET)/bin/libtermcap.dll'; \ - rm -f '$(PREFIX)/$(TARGET)/lib/libtermcap.dll'; \ + $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(MXE_LIBDIR)/libtermcap.a' --install '$(INSTALL)' --libdir '$(MXE_LIBDIR)' --bindir '$(MXE_BINDIR)'; \ fi endef