[maemo-commits] [maemo-commits] r13822 - projects/haf/trunk/glib/debian

[From: subversion at stage.maemo.org]

Author: tko
Date: 2007-09-14 16:41:54 +0300 (Fri, 14 Sep 2007)
New Revision: 13822

Modified:
   projects/haf/trunk/glib/debian/changelog
   projects/haf/trunk/glib/debian/rules
Log:
  * debian/rules: --enable-gtk-doc (with nodocs DEB_BUILD_OPTIONS support)
    (Fixes: NB#69302)


Modified: projects/haf/trunk/glib/debian/changelog
===================================================================
--- projects/haf/trunk/glib/debian/changelog	2007-09-14 13:21:41 UTC (rev 13821)
+++ projects/haf/trunk/glib/debian/changelog	2007-09-14 13:41:54 UTC (rev 13822)
@@ -1,3 +1,12 @@
+glib2.0 (2.12.12-1osso9) UNRELEASE; urgency=low
+
+  * NOT RELEASED YET
+
+  * debian/rules: --enable-gtk-doc (with nodocs DEB_BUILD_OPTIONS support)
+    (Fixes: NB#69302)
+
+ -- Tommi Komulainen <tommi.komulainen at nokia.com>  Fri, 14 Sep 2007 16:41:24 +0300
+
 glib2.0 (2.12.12-1osso8) unstable; urgency=low
 
   * compile gmessages.c with -fno-omit-frame-pointer. Fixes: NB#68368

Modified: projects/haf/trunk/glib/debian/rules
===================================================================
--- projects/haf/trunk/glib/debian/rules	2007-09-14 13:21:41 UTC (rev 13821)
+++ projects/haf/trunk/glib/debian/rules	2007-09-14 13:41:54 UTC (rev 13822)
@@ -30,6 +30,11 @@
 endif
 endif
 
+ifeq (,$(findstring nodocs,$(DEB_BUILD_OPTIONS)))
+ENABLE_GTK_DOC = --enable-gtk-doc
+else
+ENABLE_GTK_DOC = --disable-gtk-doc
+endif
 
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	INSTALL_PROGRAM += -s
@@ -82,7 +87,7 @@
 			--infodir=\$${prefix}/share/info \
 			--with-html-dir=\$${prefix}/share/doc/libglib$(apiver)-doc \
 			--enable-static \
-			--disable-gtk-doc
+			$(ENABLE_GTK_DOC)
 
 	cd $(BUILD_DEB_DIR) && \
 	sed < libtool > libtool-2 \