[maemo-commits] [maemo-commits] r14603 - projects/haf/trunk/hildon-notify/debian

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-10-24 15:49:34 +0300 (Wed, 24 Oct 2007)
New Revision: 14603

Modified:
   projects/haf/trunk/hildon-notify/debian/changelog
   projects/haf/trunk/hildon-notify/debian/libhildonnotify0-doc.install
   projects/haf/trunk/hildon-notify/debian/rules
Log:
More fixes in rules and libhildonnotify0-doc.install. 


Modified: projects/haf/trunk/hildon-notify/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-notify/debian/changelog	2007-10-24 12:30:48 UTC (rev 14602)
+++ projects/haf/trunk/hildon-notify/debian/changelog	2007-10-24 12:49:34 UTC (rev 14603)
@@ -1,3 +1,9 @@
+hildon-notify (0.0.3-4) unstable; urgency=low
+
+  * More fixes in rules and libhildonnotify0-doc.install. 
+
+ -- Lucas Rocha <lucas.rocha at nokia.com>  Wed, 24 Oct 2007 15:49:04 +0300
+
 hildon-notify (0.0.3-3) unstable; urgency=low
 
   * Some fixes in the doc build system.

Modified: projects/haf/trunk/hildon-notify/debian/libhildonnotify0-doc.install
===================================================================
--- projects/haf/trunk/hildon-notify/debian/libhildonnotify0-doc.install	2007-10-24 12:30:48 UTC (rev 14602)
+++ projects/haf/trunk/hildon-notify/debian/libhildonnotify0-doc.install	2007-10-24 12:49:34 UTC (rev 14603)
@@ -1 +1 @@
-usr/share/doc/libhildonnotify0-doc
+usr/share/doc/libhildonnotify0-doc/*

Modified: projects/haf/trunk/hildon-notify/debian/rules
===================================================================
--- projects/haf/trunk/hildon-notify/debian/rules	2007-10-24 12:30:48 UTC (rev 14602)
+++ projects/haf/trunk/hildon-notify/debian/rules	2007-10-24 12:49:34 UTC (rev 14603)
@@ -29,6 +29,12 @@
 	CFLAGS += -O2
 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
 endif
@@ -52,8 +58,8 @@
 	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) \
 	                               --build=$(DEB_BUILD_GNU_TYPE) \
 				       --prefix=/usr \
-				       --enable-gtk-doc \
-				       --with-html-dir=/usr/share/doc/libhildonnotify0-doc
+				       $(ENABLE_GTK_DOC) \
+				       --with-html-dir=\$${prefix}/share/doc/libhildonnotify0-doc
 
 build: build-stamp
 build-stamp:  config.status
@@ -97,9 +103,8 @@
 
 # Build architecture-independent files here.
 binary-indep: build install
-	dh_installdocs -i
 	dh_link -plibhildonnotify0-doc			\
-		usr/share/doc/libhildonnotify0-doc/	\
+		usr/share/doc/libhildonnotify0-doc/libhildonnotify \
 		usr/share/gtk-doc/html/libhildonnotify;
 
 # Build architecture-dependent files here.
@@ -107,7 +112,7 @@
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs
-	dh_installdocs -a
+	dh_installdocs 
 	dh_install --sourcedir=debian/build -v
 #	dh_installexamples
 #	dh_install