diff options
author | Volker Grabsch <vog@notjusthosting.com> | 2009-03-05 14:22:43 (GMT) |
---|---|---|
committer | Volker Grabsch <vog@notjusthosting.com> | 2009-03-05 14:22:43 (GMT) |
commit | fc91f750200179725374365194962d6d5da9ac7c (patch) | |
tree | 695a913e214db3650c3f6c5a5ef8260bf4c91f9c /src | |
parent | 49a3b91ee4fe3d62af870689bd46005ca7fd00e2 (diff) | |
download | mxe-fc91f750200179725374365194962d6d5da9ac7c.zip mxe-fc91f750200179725374365194962d6d5da9ac7c.tar.gz mxe-fc91f750200179725374365194962d6d5da9ac7c.tar.bz2 |
bugfix in several build rules: use "$(SED)" instead of "sed"
Diffstat (limited to 'src')
-rw-r--r-- | src/atk.mk | 2 | ||||
-rw-r--r-- | src/cairo.mk | 2 | ||||
-rw-r--r-- | src/fontconfig.mk | 2 | ||||
-rw-r--r-- | src/glib.mk | 2 | ||||
-rw-r--r-- | src/gtk.mk | 26 | ||||
-rw-r--r-- | src/pango.mk | 10 |
6 files changed, 22 insertions, 22 deletions
@@ -16,7 +16,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - sed 's,DllMain,static _disabled_DllMain,' -i '$(1)/atk/atkobject.c' + $(SED) 's,DllMain,static _disabled_DllMain,' -i '$(1)/atk/atkobject.c' cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ diff --git a/src/cairo.mk b/src/cairo.mk index 1b333a7..8733e44 100644 --- a/src/cairo.mk +++ b/src/cairo.mk @@ -16,7 +16,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - sed 's,^\(Libs:.*\),\1 @CAIRO_NONPKGCONFIG_LIBS@,' -i '$(1)/src/cairo.pc.in' + $(SED) 's,^\(Libs:.*\),\1 @CAIRO_NONPKGCONFIG_LIBS@,' -i '$(1)/src/cairo.pc.in' cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ diff --git a/src/fontconfig.mk b/src/fontconfig.mk index f9cdd12..15728b5 100644 --- a/src/fontconfig.mk +++ b/src/fontconfig.mk @@ -20,7 +20,7 @@ define $(PKG)_BUILD $(SED) 's,^install-data-local:.*,install-data-local:,' -i '$(1)/src/Makefile.in' # wine confuses the cross-compiling detection, so set it explicitly $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure' - sed 's,^\(Libs:.*\),\1 @EXPAT_LIBS@ @FREETYPE_LIBS@,' -i '$(1)/fontconfig.pc.in' + $(SED) 's,^\(Libs:.*\),\1 @EXPAT_LIBS@ @FREETYPE_LIBS@,' -i '$(1)/fontconfig.pc.in' cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ diff --git a/src/glib.mk b/src/glib.mk index 98608cb..bd1ebcd 100644 --- a/src/glib.mk +++ b/src/glib.mk @@ -30,7 +30,7 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)/$(glib_SUBDIR)/glib' -j '$(JOBS)' $(MAKE) -C '$(1)/$(glib_SUBDIR)/gobject' -j '$(JOBS)' lib_LTLIBRARIES= install-exec # cross build - sed 's,^\(Libs:.*\),\1 @PCRE_LIBS@ @G_THREAD_LIBS@ @G_LIBS_EXTRA@ -lshlwapi,' -i '$(1)/glib-2.0.pc.in' + $(SED) 's,^\(Libs:.*\),\1 @PCRE_LIBS@ @G_THREAD_LIBS@ @G_LIBS_EXTRA@ -lshlwapi,' -i '$(1)/glib-2.0.pc.in' cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ @@ -16,19 +16,19 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - sed 's,DllMain,static _disabled_DllMain,' -i '$(1)/gdk/win32/gdkmain-win32.c' - sed 's,DllMain,static _disabled_DllMain,' -i '$(1)/gdk-pixbuf/gdk-pixbuf-io.c' - sed 's,DllMain,static _disabled_DllMain,' -i '$(1)/gtk/gtkmain.c' - sed 's,__declspec(dllimport),,' -i '$(1)/gdk/gdktypes.h' - sed 's,^\(Libs:.*\)@GTK_EXTRA_LIBS@,\1@GTK_DEP_LIBS@,' -i '$(1)/gtk+-2.0.pc.in' - sed 's,^\(gtkbuiltincache\.h:\),_disabled_\1,' -i '$(1)/gtk/Makefile.in' - sed 's,^\(install-data-local:.*\) install-libtool-import-lib,\1,' -i '$(1)/modules/other/gail/libgail-util/Makefile.in' - sed 's,\(BUILT_SOURCES.*=.*\)test-inline-pixbufs.h,\1,' -i '$(1)/demos/Makefile.in' - sed 's,"[^"]*must build as DLL[^"]*","(disabled warning)",' -i '$(1)/configure' - sed 's,enable_static=no,enable_static=yes,' -i '$(1)/configure' - sed 's,enable_shared=yes,enable_shared=no,' -i '$(1)/configure' - sed 's,\(STATIC_LIB_DEPS="[^"]*\) \$$LIBJPEG,\1 $$LIBJASPER $$LIBJPEG,' -i '$(1)/configure' - sed 's/-Wl,-luuid/-luuid/' -i '$(1)/configure' + $(SED) 's,DllMain,static _disabled_DllMain,' -i '$(1)/gdk/win32/gdkmain-win32.c' + $(SED) 's,DllMain,static _disabled_DllMain,' -i '$(1)/gdk-pixbuf/gdk-pixbuf-io.c' + $(SED) 's,DllMain,static _disabled_DllMain,' -i '$(1)/gtk/gtkmain.c' + $(SED) 's,__declspec(dllimport),,' -i '$(1)/gdk/gdktypes.h' + $(SED) 's,^\(Libs:.*\)@GTK_EXTRA_LIBS@,\1@GTK_DEP_LIBS@,' -i '$(1)/gtk+-2.0.pc.in' + $(SED) 's,^\(gtkbuiltincache\.h:\),_disabled_\1,' -i '$(1)/gtk/Makefile.in' + $(SED) 's,^\(install-data-local:.*\) install-libtool-import-lib,\1,' -i '$(1)/modules/other/gail/libgail-util/Makefile.in' + $(SED) 's,\(BUILT_SOURCES.*=.*\)test-inline-pixbufs.h,\1,' -i '$(1)/demos/Makefile.in' + $(SED) 's,"[^"]*must build as DLL[^"]*","(disabled warning)",' -i '$(1)/configure' + $(SED) 's,enable_static=no,enable_static=yes,' -i '$(1)/configure' + $(SED) 's,enable_shared=yes,enable_shared=no,' -i '$(1)/configure' + $(SED) 's,\(STATIC_LIB_DEPS="[^"]*\) \$$LIBJPEG,\1 $$LIBJASPER $$LIBJPEG,' -i '$(1)/configure' + $(SED) 's/-Wl,-luuid/-luuid/' -i '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ diff --git a/src/pango.mk b/src/pango.mk index 57433c2..d49886e 100644 --- a/src/pango.mk +++ b/src/pango.mk @@ -16,11 +16,11 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - sed 's,DllMain,static _disabled_DllMain,' -i '$(1)/pango/pango-utils.c' - sed 's,"[^"]*must build as DLL[^"]*","(disabled warning)",' -i '$(1)/configure' - sed 's,enable_static=no,enable_static=yes,' -i '$(1)/configure' - sed 's,enable_shared=yes,enable_shared=no,' -i '$(1)/configure' - sed 's,^install-data-local:.*,install-data-local:,' -i '$(1)/modules/Makefile.in' + $(SED) 's,DllMain,static _disabled_DllMain,' -i '$(1)/pango/pango-utils.c' + $(SED) 's,"[^"]*must build as DLL[^"]*","(disabled warning)",' -i '$(1)/configure' + $(SED) 's,enable_static=no,enable_static=yes,' -i '$(1)/configure' + $(SED) 's,enable_shared=yes,enable_shared=no,' -i '$(1)/configure' + $(SED) 's,^install-data-local:.*,install-data-local:,' -i '$(1)/modules/Makefile.in' cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ |