* debian/rules: ./configure call, put one argument per line for clarity. * debian...

diff --git a/debian/changelog b/debian/changelog
index 2a847ad..1d74755 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 hildon-libs (0.12.9-1+svn-1) unstable; urgency=low
 
+  * debian/rules: ./configure call, put one argument per line for clarity.
+  * debian/rules: call ./autogen.sh to create ./configure
+
   * N#22557 - Private symbols from gtk+ are not to be used
   * debian/control: N#22557, updated dependency to GTK+ (needs 2.6.10-1.osso4)
        

diff --git a/debian/rules b/debian/rules
index 9396b10..1e57c17 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+SOURCE_DIR=$(CURDIR)
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
@@ -33,11 +34,21 @@ major=2
 #major=`ls src/.libs/lib*.so.* | \
 # awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
 
-config.status: configure
+config.status: $(SOURCE_DIR)/configure
        dh_testdir
-       # Add here commands to configure the package.
-       CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-doc-dir=\$${prefix}/share/doc --disable-dependency-tracking --disable-gtk-doc
-
+#      Add here commands to configure the package.
+       CFLAGS="$(CFLAGS)" ./configure              \
+               --host=$(DEB_HOST_GNU_TYPE)          \
+               --build=$(DEB_BUILD_GNU_TYPE)        \
+               --prefix=/usr                        \
+               --mandir=\$${prefix}/share/man       \
+               --infodir=\$${prefix}/share/info     \
+               --with-doc-dir=\$${prefix}/share/doc \
+               --disable-dependency-tracking        \
+               --disable-gtk-doc
+
+$(SOURCE_DIR)/configure:
+       AUTOGEN_SUBDIR_MODE=1 $(SOURCE_DIR)/autogen.sh
 
 build: build-stamp
 build-stamp:  config.status