Mercurial > mxe-octave
changeset 285:08a32251156c
portability fix for Open Solaris: when "ginstall" exists, use that instead of "install"
author | Volker Grabsch <vog@notjusthosting.com> |
---|---|
date | Sat, 07 Mar 2009 08:52:50 +0100 |
parents | eb5d52f8c620 |
children | f0efb1991a35 |
files | Makefile src/bzip2.mk src/glew.mk src/mingwrt.mk src/old.mk src/pdcurses.mk src/pkg_config.mk src/pthreads.mk src/w32api.mk src/winpcap.mk src/wxwidgets.mk |
diffstat | 11 files changed, 37 insertions(+), 36 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Sat Mar 07 08:51:19 2009 +0100 +++ b/Makefile Sat Mar 07 08:52:50 2009 +0100 @@ -13,6 +13,7 @@ PATH := $(PREFIX)/bin:$(PATH) SHELL := bash SED := $(shell gsed --help >/dev/null 2>&1 && echo g)sed +INSTALL := $(shell ginstall --help >/dev/null 2>&1 && echo g)install SHORT_PKG_VERSION = \ $(word 1,$(subst ., ,$($(1)_VERSION))).$(word 2,$(subst ., ,$($(1)_VERSION)))
--- a/src/bzip2.mk Sat Mar 07 08:51:19 2009 +0100 +++ b/src/bzip2.mk Sat Mar 07 08:52:50 2009 +0100 @@ -22,8 +22,8 @@ CC='$(TARGET)-gcc' \ AR='$(TARGET)-ar' \ RANLIB='$(TARGET)-ranlib' - install -d '$(PREFIX)/$(TARGET)/lib' - install -m664 '$(1)/libbz2.a' '$(PREFIX)/$(TARGET)/lib/' - install -d '$(PREFIX)/$(TARGET)/include' - install -m664 '$(1)/bzlib.h' '$(PREFIX)/$(TARGET)/include/' + $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib' + $(INSTALL) -m664 '$(1)/libbz2.a' '$(PREFIX)/$(TARGET)/lib/' + $(INSTALL) -d '$(PREFIX)/$(TARGET)/include' + $(INSTALL) -m664 '$(1)/bzlib.h' '$(PREFIX)/$(TARGET)/include/' endef
--- a/src/glew.mk Sat Mar 07 08:51:19 2009 +0100 +++ b/src/glew.mk Sat Mar 07 08:52:50 2009 +0100 @@ -19,10 +19,10 @@ cd '$(1)' && $(TARGET)-gcc -O2 -DGLEW_STATIC -Iinclude -c -o glew.o src/glew.c cd '$(1)' && $(TARGET)-ar cr libGLEW.a glew.o $(TARGET)-ranlib '$(1)/libGLEW.a' - install -d '$(PREFIX)/$(TARGET)/lib' - install -m644 '$(1)/libGLEW.a' '$(PREFIX)/$(TARGET)/lib/' - install -m644 '$(1)/libGLEW.a' '$(PREFIX)/$(TARGET)/lib/libglew32s.a' - install -d '$(PREFIX)/$(TARGET)/include' - install -d '$(PREFIX)/$(TARGET)/include/GL' - install -m644 '$(1)/include/GL/glew.h' '$(1)/include/GL/wglew.h' '$(PREFIX)/$(TARGET)/include/GL/' + $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib' + $(INSTALL) -m644 '$(1)/libGLEW.a' '$(PREFIX)/$(TARGET)/lib/' + $(INSTALL) -m644 '$(1)/libGLEW.a' '$(PREFIX)/$(TARGET)/lib/libglew32s.a' + $(INSTALL) -d '$(PREFIX)/$(TARGET)/include' + $(INSTALL) -d '$(PREFIX)/$(TARGET)/include/GL' + $(INSTALL) -m644 '$(1)/include/GL/glew.h' '$(1)/include/GL/wglew.h' '$(PREFIX)/$(TARGET)/include/GL/' endef
--- a/src/mingwrt.mk Sat Mar 07 08:51:19 2009 +0100 +++ b/src/mingwrt.mk Sat Mar 07 08:52:50 2009 +0100 @@ -16,7 +16,7 @@ endef define $(PKG)_BUILD - install -d '$(PREFIX)/$(TARGET)' + $(INSTALL) -d '$(PREFIX)/$(TARGET)' cd '$(1)' && \ cp -rpv include lib '$(PREFIX)/$(TARGET)' endef
--- a/src/old.mk Sat Mar 07 08:51:19 2009 +0100 +++ b/src/old.mk Sat Mar 07 08:52:50 2009 +0100 @@ -19,8 +19,8 @@ cd '$(1)' && $(TARGET)-gcc -O3 -Iinclude -c -o libold.o lib/libold.c cd '$(1)' && $(TARGET)-ar cr libold.a libold.o $(TARGET)-ranlib '$(1)/libold.a' - install -d '$(PREFIX)/$(TARGET)/lib' - install -m644 '$(1)/libold.a' '$(PREFIX)/$(TARGET)/lib/' - install -d '$(PREFIX)/$(TARGET)/include' - install -m644 '$(1)/lib/old.h' '$(PREFIX)/$(TARGET)/include/' + $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib' + $(INSTALL) -m644 '$(1)/libold.a' '$(PREFIX)/$(TARGET)/lib/' + $(INSTALL) -d '$(PREFIX)/$(TARGET)/include' + $(INSTALL) -m644 '$(1)/lib/old.h' '$(PREFIX)/$(TARGET)/include/' endef
--- a/src/pdcurses.mk Sat Mar 07 08:51:19 2009 +0100 +++ b/src/pdcurses.mk Sat Mar 07 08:52:50 2009 +0100 @@ -25,9 +25,9 @@ WIDE=Y \ UTF8=Y $(TARGET)-ranlib '$(1)/pdcurses.a' '$(1)/panel.a' - install -d '$(PREFIX)/$(TARGET)/include/' - install -m644 '$(1)/curses.h' '$(1)/panel.h' '$(1)/term.h' '$(PREFIX)/$(TARGET)/include/' - install -d '$(PREFIX)/$(TARGET)/lib/' - install -m644 '$(1)/pdcurses.a' '$(PREFIX)/$(TARGET)/lib/libpdcurses.a' - install -m644 '$(1)/panel.a' '$(PREFIX)/$(TARGET)/lib/libpanel.a' + $(INSTALL) -d '$(PREFIX)/$(TARGET)/include/' + $(INSTALL) -m644 '$(1)/curses.h' '$(1)/panel.h' '$(1)/term.h' '$(PREFIX)/$(TARGET)/include/' + $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib/' + $(INSTALL) -m644 '$(1)/pdcurses.a' '$(PREFIX)/$(TARGET)/lib/libpdcurses.a' + $(INSTALL) -m644 '$(1)/panel.a' '$(PREFIX)/$(TARGET)/lib/libpanel.a' endef
--- a/src/pkg_config.mk Sat Mar 07 08:51:19 2009 +0100 +++ b/src/pkg_config.mk Sat Mar 07 08:52:50 2009 +0100 @@ -18,7 +18,7 @@ cd '$(1)' && ./configure \ --prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' install - install -d '$(PREFIX)/bin' + $(INSTALL) -d '$(PREFIX)/bin' rm -f '$(PREFIX)/bin/$(TARGET)-pkg-config' ln -s '../$(TARGET)/bin/pkg-config' '$(PREFIX)/bin/$(TARGET)-pkg-config' endef
--- a/src/pthreads.mk Sat Mar 07 08:51:19 2009 +0100 +++ b/src/pthreads.mk Sat Mar 07 08:52:50 2009 +0100 @@ -18,8 +18,8 @@ define $(PKG)_BUILD $(SED) '35i\#define PTW32_STATIC_LIB' -i '$(1)/pthread.h' $(MAKE) -C '$(1)' -j 1 GC-static CROSS='$(TARGET)-' - install -d '$(PREFIX)/$(TARGET)/lib' - install -m664 '$(1)/libpthreadGC2.a' '$(PREFIX)/$(TARGET)/lib/libpthread.a' - install -d '$(PREFIX)/$(TARGET)/include' - install -m664 '$(1)/pthread.h' '$(1)/sched.h' '$(1)/semaphore.h' '$(PREFIX)/$(TARGET)/include/' + $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib' + $(INSTALL) -m664 '$(1)/libpthreadGC2.a' '$(PREFIX)/$(TARGET)/lib/libpthread.a' + $(INSTALL) -d '$(PREFIX)/$(TARGET)/include' + $(INSTALL) -m664 '$(1)/pthread.h' '$(1)/sched.h' '$(1)/semaphore.h' '$(PREFIX)/$(TARGET)/include/' endef
--- a/src/w32api.mk Sat Mar 07 08:51:19 2009 +0100 +++ b/src/w32api.mk Sat Mar 07 08:52:50 2009 +0100 @@ -24,6 +24,6 @@ # fix missing definitions for WinPcap and libdnet $(SED) '1i\#include <wtypes.h>' -i '$(1)/include/iphlpapi.h' $(SED) '1i\#include <wtypes.h>' -i '$(1)/include/wincrypt.h' - install -d '$(PREFIX)/$(TARGET)' + $(INSTALL) -d '$(PREFIX)/$(TARGET)' cp -rpv '$(1)/include' '$(1)/lib' '$(PREFIX)/$(TARGET)' endef
--- a/src/winpcap.mk Sat Mar 07 08:51:19 2009 +0100 +++ b/src/winpcap.mk Sat Mar 07 08:52:50 2009 +0100 @@ -25,10 +25,10 @@ cd '$(1)' && $(TARGET)-gcc -Icommon -O -c '$(1)/Packet9x/DLL/Packet32.c' $(TARGET)-ar rc '$(1)/libpacket.a' '$(1)/Packet32.o' $(TARGET)-ranlib '$(1)/libpacket.a' - install -d '$(PREFIX)/$(TARGET)/include' - install -m644 '$(1)/common'/*.h '$(PREFIX)/$(TARGET)/include/' - install -d '$(PREFIX)/$(TARGET)/lib' - install -m644 '$(1)/libpacket.a' '$(PREFIX)/$(TARGET)/lib/' + $(INSTALL) -d '$(PREFIX)/$(TARGET)/include' + $(INSTALL) -m644 '$(1)/common'/*.h '$(PREFIX)/$(TARGET)/include/' + $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib' + $(INSTALL) -m644 '$(1)/libpacket.a' '$(PREFIX)/$(TARGET)/lib/' mv '$(1)/wpcap/libpcap/Win32/Include/ip6_misc.h' '$(1)/wpcap/libpcap/Win32/Include/IP6_misc.h' $(SED) 's,(char\*)tUstr +=,tUstr +=,' -i '$(1)/wpcap/libpcap/inet.c' $(SED) 's,-DHAVE_AIRPCAP_API,,' -i '$(1)/wpcap/PRJ/GNUmakefile' @@ -40,8 +40,8 @@ AR='$(TARGET)-ar' \ RANLIB='$(TARGET)-ranlib' \ $(MAKE) -C '$(1)/wpcap/PRJ' -j 1 libwpcap.a - install -d '$(PREFIX)/$(TARGET)/include' - install -m644 '$(1)/wpcap/libpcap/'*.h '$(1)/wpcap/Win32-Extensions/'*.h '$(PREFIX)/$(TARGET)/include/' - install -d '$(PREFIX)/$(TARGET)/lib' - install -m644 '$(1)/wpcap/PRJ/libwpcap.a' '$(PREFIX)/$(TARGET)/lib/' + $(INSTALL) -d '$(PREFIX)/$(TARGET)/include' + $(INSTALL) -m644 '$(1)/wpcap/libpcap/'*.h '$(1)/wpcap/Win32-Extensions/'*.h '$(PREFIX)/$(TARGET)/include/' + $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib' + $(INSTALL) -m644 '$(1)/wpcap/PRJ/libwpcap.a' '$(PREFIX)/$(TARGET)/lib/' endef
--- a/src/wxwidgets.mk Sat Mar 07 08:51:19 2009 +0100 +++ b/src/wxwidgets.mk Sat Mar 07 08:52:50 2009 +0100 @@ -58,7 +58,7 @@ LIBS=" `$(TARGET)-pkg-config tre --libs`" $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= __install_wxrc___depname= - install -m755 '$(PREFIX)/$(TARGET)/bin/wx-config' '$(PREFIX)/bin/$(TARGET)-wx-config' + $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/bin/wx-config' '$(PREFIX)/bin/$(TARGET)-wx-config' # build the wxWidgets variant without unicode support cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,wxwidgets) @@ -110,7 +110,7 @@ $(MAKE) -C '$(1)/$(wxwidgets_SUBDIR)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= __install_wxrc___depname= mv '$(PREFIX)/$(TARGET)/bin/wx-config' '$(PREFIX)/$(TARGET)/bin/wx-config-nounicode' - install -m755 '$(PREFIX)/$(TARGET)/bin/wx-config-nounicode' '$(PREFIX)/bin/$(TARGET)-wx-config-nounicode' + $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/bin/wx-config-nounicode' '$(PREFIX)/bin/$(TARGET)-wx-config-nounicode' # restore the unicode wx-config script mv '$(PREFIX)/$(TARGET)/bin/wx-config-backup' '$(PREFIX)/$(TARGET)/bin/wx-config'