* debian/rules: tell ./autogen.sh to not launch ./configure * debian/rules: install...

diff --git a/debian/changelog b/debian/changelog
index 1d74755..837921c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 hildon-libs (0.12.9-1+svn-1) unstable; urgency=low
 
+  * debian/rules: tell ./autogen.sh to not launch ./configure 
+  * debian/rules: install docs only if ENABLE_GTK_DOC is set
   * debian/rules: ./configure call, put one argument per line for clarity.
   * debian/rules: call ./autogen.sh to create ./configure
 

diff --git a/debian/rules b/debian/rules
index 1e57c17..4dd2959 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -48,7 +48,7 @@ config.status: $(SOURCE_DIR)/configure
                --disable-gtk-doc
 
 $(SOURCE_DIR)/configure:
-       AUTOGEN_SUBDIR_MODE=1 $(SOURCE_DIR)/autogen.sh
+       AUTOGEN_SUBDIR_MODE=1 NOCONFIGURE=yes $(SOURCE_DIR)/autogen.sh
 
 build: build-stamp
 build-stamp:  config.status
@@ -102,7 +102,11 @@ binary-arch: build install
        dh_testroot
        dh_installchangelogs 
 #      dh_installexamples
-       dh_installdocs
+       @if [ "x$(ENABLE_GTK_DOC)" != "x" ]; then \
+           dh_installdocs;                       \
+       else                                      \
+           echo "oh nooooooo, no gtk-doc :(";    \
+       fi
        dh_install --sourcedir=debian/build -v
 #      dh_installmenu
 #      dh_installdebconf