summaryrefslogtreecommitdiff
path: root/pango
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2011-05-31 10:52:20 +0200
committerJan Holesovsky <kendy@suse.cz>2011-05-31 10:52:20 +0200
commit7a6dead55d7376c69554bd7f6c5b8278af14701a (patch)
treefa84e8c5a7c53f4c54012cac597b45c48493382e /pango
parent0f9a1b73ad2943b0fa3a9b1e6c81150c712b2a52 (diff)
parentb61b156d52d24a7cfc42fb47d922bbc292bc6835 (diff)
Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/libs-extern-sys
Conflicts: graphite/graphite2-0.9.2.patch
Diffstat (limited to 'pango')
-rw-r--r--pango/makefile.mk5
1 files changed, 4 insertions, 1 deletions
diff --git a/pango/makefile.mk b/pango/makefile.mk
index fddbbecf83a1..6e9165e8ecf5 100644
--- a/pango/makefile.mk
+++ b/pango/makefile.mk
@@ -67,7 +67,10 @@ CONFIGURE_FLAGS=--with-included-modules=yes
CONFIGURE_FLAGS+= CPPFLAGS="$(ARCH_FLAGS) $(EXTRA_CDEFS)"
CONFIGURE_ACTION+="--without-x"
-BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
+.IF "$(VERBOSE)"!=""
+VFLAG=V=1
+.ENDIF
+BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) $(VFLAG)
BUILD_DIR=$(CONFIGURE_DIR)
EXTRPATH=LOADER