- Add build-dependency on automake

- Fix config.cache/config.sub issue

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@434 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/debian/control b/debian/control
index f84c834c4bdd9ede4893bae99b01e512700ab6a9..794cb3b4aa9389416bedbb0cc955d410c3544b70 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: sope
 Priority: extra
 Maintainer: Sebastian Ley <ley@debian.org>
-Build-Depends: debhelper (>= 4.0.0), dpatch, gnustep-make-ogo, gobjc | objc-compiler, libfoundation-dev, libobjc-lf-dev, libxml2-dev, libldap-dev, libssl-dev, zlib1g-dev, postgresql-dev, apache-dev
+Build-Depends: debhelper (>= 4.0.0), dpatch, gnustep-make-ogo, gobjc | objc-compiler, libfoundation-dev, libobjc-lf-dev, libxml2-dev, libldap-dev, libssl-dev, zlib1g-dev, postgresql-dev, apache-dev, automake
 Standards-Version: 3.6.1
 
 Package: libsope4.5-dev

diff --git a/debian/control.in b/debian/control.in
index 9c651b5e05929bf5a8b0e9b9bba314a1b5b97c7c..21d731cd431ec5e4801920b0207d66e099def005 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -1,7 +1,7 @@
 Source: sope
 Priority: extra
 Maintainer: Sebastian Ley <ley@debian.org>
-Build-Depends: debhelper (>= 4.0.0), dpatch, gnustep-make-ogo, gobjc | objc-compiler, libfoundation-dev, libobjc-lf-dev, libxml2-dev, libldap-dev, libssl-dev, zlib1g-dev, postgresql-dev, apache-dev
+Build-Depends: debhelper (>= 4.0.0), dpatch, gnustep-make-ogo, gobjc | objc-compiler, libfoundation-dev, libobjc-lf-dev, libxml2-dev, libldap-dev, libssl-dev, zlib1g-dev, postgresql-dev, apache-dev, automake
 Standards-Version: 3.6.1
 
 Package: libsope_SOPEVER_-dev

diff --git a/debian/rules b/debian/rules
index 6c98f518339764412e0ae1c8bccf7928d5306484..56d9ae2c8101f4a46963d087274fac29f4903698 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -76,10 +76,18 @@ clean: unpatch clean-controlfiles
        rm -f configure-stamp
        rm -f build-stamp
 
-       -rm sope-core/NGStreams/config.guess
-       -rm sope-core/NGStreams/config.sub
-       -mv sope-core/NGStreams/config.guess.upstream sope-core/NGStreams/config.guess
-       -mv sope-core/NGStreams/config.sub.upstream sope-core/NGStreams/config.sub
+       if [-l sope-core/NGStreams/config.guess ]; then \
+               rm sope-core/NGStreams/config.guess; \
+       fi
+       if [-l sope-core/NGStreams/config.sub ]; then \
+               rm sope-core/NGStreams/config.sub; \
+       fi
+       if [ -f sope-core/NGStreams/config.guess.upstream ]; then \
+               mv sope-core/NGStreams/config.guess.upstream sope-core/NGStreams/config.guess; \
+       fi
+       if [ -f sope-core/NGStreams/config.sub.upstream ]; then \
+               mv sope-core/NGStreams/config.sub.upstream sope-core/NGStreams/config.sub; \
+       fi
 
        -. $(GNUSTEP_SETUP); $(MAKE) -C sope-appserver/mod_ngobjweb clean
        -. $(GNUSTEP_SETUP); $(MAKE) -C sope-appserver/mod_ngobjweb distclean