[#1499] Fixed destination directory bug

tools/build-system/distributions/mandriva/build-packages-mandriva.sh

 #!/bin/bash
 #####################################################
-# File Name: build-packages-opensuse.sh
+# File Name: build-packages-mandriva.sh
 #
 # Purpose :
 #
 # Author: Julien Bonjean (julien@bonjean.info) 
 #
 # Creation Date: 2009-05-27
-# Last Modified: 2009-06-01 17:24:52 -0400
+# Last Modified: 2009-06-04 16:29:34 -0400
 #####################################################
 
 . ../globals
@@ -75,7 +75,7 @@ do
 	cd ${PACKAGING_DIR}
 
 	echo " -> update spec file"
-	sed "s/VERSION/${VERSION}/g" opensuse/${PACKAGE}.spec > ${BUILD_DIR}/SPECS/${PACKAGE}.spec
+	sed "s/VERSION/${VERSION}/g" mandriva/${PACKAGE}.spec > ${BUILD_DIR}/SPECS/${PACKAGE}.spec
 
 	if [ "$?" -ne "0" ]; then
                 echo "!! Cannot update spec file"

tools/build-system/distributions/mandriva/sflphone-client-gnome.spec

@@ -61,7 +61,7 @@ Authors:
 make -j
 
 %install
-make prefix=%{buildroot}/%{_prefix} install
+make DESTDIR=%{buildroot} install
 
 %clean
 make clean

tools/build-system/distributions/mandriva/sflphone-client-kde.spec

@@ -50,11 +50,11 @@ Authors:
 %setup -q
 
 %build
-cmake . -DCMAKE_INSTALL_PREFIX=%{buildroot}/%{_prefix}
+cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
 make
 
 %install
-make install
+make DESTDIR=%{buildroot} install
 
 %clean
 make clean

tools/build-system/distributions/mandriva/sflphone-common.spec

@@ -24,7 +24,7 @@ Source0:        sflphone-common.tar.gz
 BuildRequires:	glibc-devel
 BuildRequires:	libccrtp-devel
 BuildRequires:	libsamplerate-devel
-BuildRequires:	dbus-1-devel
+BuildRequires:	libdbus-1-devel
 BuildRequires:	libexpat-devel
 BuildRequires:	libgsm-devel
 BuildRequires:	speex-devel
@@ -70,9 +70,9 @@ make -j
 
 %install
 cd libs/pjproject-1.0.1
-make prefix=%{buildroot}/%{_prefix} install
+make DESTDIR=%{buildroot} install
 cd -
-make prefix=%{buildroot}/%{_prefix} install
+make DESTDIR=%{buildroot} install
 
 %clean
 cd libs/pjproject-1.0.1

tools/build-system/distributions/opensuse/sflphone-client-gnome.spec

@@ -61,7 +61,7 @@ Authors:
 make -j
 
 %install
-make prefix=%{buildroot}/%{_prefix} install
+make DESTDIR=%{buildroot} install
 
 %clean
 make clean

tools/build-system/distributions/opensuse/sflphone-client-kde.spec

@@ -30,6 +30,7 @@ Requires:	libqt4-x11
 BuildRequires:  cmake
 BuildRequires:  libkdepimlibs4-devel
 BuildRequires:  commoncpp2-devel
+BuildRequires:	gettext-tools
 Conflicts:	sflphone
 Prefix:		%{_prefix}
 
@@ -50,11 +51,11 @@ Authors:
 %setup -q
 
 %build
-cmake . -DCMAKE_INSTALL_PREFIX=%{buildroot}/%{_prefix}
+cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
 make
 
 %install
-make install
+make DESTDIR=%{buildroot} install
 
 %clean
 make clean

tools/build-system/distributions/opensuse/sflphone-common.spec

@@ -69,9 +69,9 @@ make -j
 
 %install
 cd libs/pjproject-1.0.1
-make prefix=%{buildroot}/%{_prefix} install
+make DESTDIR=%{buildroot} install
 cd -
-make prefix=%{buildroot}/%{_prefix} install
+make DESTDIR=%{buildroot} install
 
 %clean
 cd libs/pjproject-1.0.1

tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/rules

@@ -70,8 +70,7 @@ install-arch:
 	dh_installdirs -s
 	# Add here commands to install the arch part of the package into 
 	# debian/tmp.
-	$(MAKE) prefix=$(CURDIR)/debian/$(package)/usr install
-	rm -rf $(CURDIR)/debian/$(package)/usr/include
+	$(MAKE) DESTDIR=$(CURDIR)/debian/$(package) install
 	dh_install -s
 # Must not depend on anything. This is to be called by
 # binary-arch/binary-indep

tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/rules

@@ -20,7 +20,7 @@ configure: configure-stamp
 configure-stamp:
 	dh_testdir
 	# Add here commands to configure the package.
-	cmake . -DCMAKE_INSTALL_PREFIX=$(CURDIR)/debian/$(package)/usr
+	cmake . -DCMAKE_INSTALL_PREFIX=/usr
 	touch configure-stamp
 
 
@@ -71,8 +71,7 @@ install-arch:
 	dh_installdirs -s
 	# Add here commands to install the arch part of the package into 
 	# debian/tmp.
-	$(MAKE) install
-	rm -rf $(CURDIR)/debian/$(package)/usr/include
+	$(MAKE) DESTDIR=$(CURDIR)/debian/$(package) install
 	dh_install -s
 # Must not depend on anything. This is to be called by
 # binary-arch/binary-indep

tools/build-system/distributions/ubuntu/debian-sflphone-common/rules

@@ -71,7 +71,7 @@ install-arch:
 	dh_installdirs -s
 	# Add here commands to install the arch part of the package into 
 	# debian/tmp.
-	$(MAKE) prefix=$(CURDIR)/debian/$(package)/usr install
+	$(MAKE) DESTDIR=$(CURDIR)/debian/$(package) install
 	cd libs/pjproject-1.0.1; $(MAKE) prefix=$(CURDIR)/debian/$(package)/usr install
 	rm -rf $(CURDIR)/debian/$(package)/usr/include
 	dh_install -s