From 076ebbaac179594b267bfcf0c492755914cb89c4 Mon Sep 17 00:00:00 2001 From: Volker Grabsch Date: Mon, 8 Feb 2010 00:21:45 +0100 Subject: improved coding style --- src/glib.mk | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/glib.mk b/src/glib.mk index 4dcb19a..033e0f4 100644 --- a/src/glib.mk +++ b/src/glib.mk @@ -23,12 +23,12 @@ endef define $(PKG)_BUILD # native build for glib-genmarshal, without pkg-config, gettext and zlib cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,glib) - $(SED) 's,^PKG_CONFIG=.*,PKG_CONFIG=echo,' -i '$(1)/$(glib_SUBDIR)/configure' - $(SED) 's,gt_cv_have_gettext=yes,gt_cv_have_gettext=no,' -i '$(1)/$(glib_SUBDIR)/configure' - $(SED) '/You must.*have gettext/,/exit 1;/ s,.*exit 1;.*,},' -i '$(1)/$(glib_SUBDIR)/configure' - $(SED) 's,found_zlib=no,found_zlib=yes,' -i '$(1)/$(glib_SUBDIR)/configure' - - cd '$(1)/$(glib_SUBDIR)' && ./configure \ + mv '$(1)/$(glib_SUBDIR)' '$(1).native' + $(SED) 's,^PKG_CONFIG=.*,PKG_CONFIG=echo,' -i '$(1).native/configure' + $(SED) 's,gt_cv_have_gettext=yes,gt_cv_have_gettext=no,' -i '$(1).native/configure' + $(SED) '/You must.*have gettext/,/exit 1;/ s,.*exit 1;.*,},' -i '$(1).native/configure' + $(SED) 's,found_zlib=no,found_zlib=yes,' -i '$(1).native/configure' + cd '$(1).native' && ./configure \ --disable-shared \ --prefix='$(PREFIX)' \ --enable-regex \ @@ -37,10 +37,10 @@ define $(PKG)_BUILD --disable-fam \ --disable-xattr \ --without-libiconv - $(SED) 's,#define G_ATOMIC.*,,' -i '$(1)/$(glib_SUBDIR)/config.h' - $(MAKE) -C '$(1)/$(glib_SUBDIR)/glib' -j '$(JOBS)' - $(MAKE) -C '$(1)/$(glib_SUBDIR)/gthread' -j '$(JOBS)' - $(MAKE) -C '$(1)/$(glib_SUBDIR)/gobject' -j '$(JOBS)' lib_LTLIBRARIES= install-exec + $(SED) 's,#define G_ATOMIC.*,,' -i '$(1).native/config.h' + $(MAKE) -C '$(1).native/glib' -j '$(JOBS)' + $(MAKE) -C '$(1).native/gthread' -j '$(JOBS)' + $(MAKE) -C '$(1).native/gobject' -j '$(JOBS)' lib_LTLIBRARIES= install-exec # cross build cd '$(1)' && aclocal -- cgit v0.12