[openrtm-commit:01510] r2601 - in branches/RELENG_1_1/OpenRTM-aist/packages/deb: . debian

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2014-12-03 16:01:12 +0900 (Wed, 03 Dec 2014)
New Revision: 2601

Modified:
   branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/rules.not-multiarch
   branches/RELENG_1_1/OpenRTM-aist/packages/deb/dpkg_build.sh
Log:
[compat, ->RELEASE_1_1_1] Deb package does not support multiarch, library path has been returned to /usr/lib or /usr/lib64.

Modified: branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/rules.not-multiarch
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/rules.not-multiarch	2014-11-27 08:29:53 UTC (rev 2600)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/rules.not-multiarch	2014-12-03 07:01:12 UTC (rev 2601)
@@ -38,7 +38,7 @@
 ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 	cp -f /usr/share/misc/config.guess config.guess
 endif
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" --libdir=\$${prefix}/lib/i386-linux-gnu
+	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" --libdir=\$${prefix}/lib-arch
 
 
 #Architecture 
@@ -115,10 +115,10 @@
 
 	# for openrtm-aist-example package
 	#$(MAKE)
-	(mkdir -p $(CURDIR)/debian/openrtm-aist-example/usr/lib)
-	(ln -s $(CURDIR)/debian/openrtm-aist/usr/lib/i386-linux-gnu $(CURDIR)/debian/openrtm-aist-example/usr/lib)
+	(mkdir -p $(CURDIR)/debian/openrtm-aist-example/usr)
+	(ln -s $(CURDIR)/debian/openrtm-aist/usr/lib-arch $(CURDIR)/debian/openrtm-aist-example/usr)
 	(cd $(CURDIR)/examples         ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist-example install)
-	(rm -r $(CURDIR)/debian/openrtm-aist-example/usr/lib)
+	(rm -r $(CURDIR)/debian/openrtm-aist-example/usr/lib-arch)
 
 	dh_install -s
 # Must not depend on anything. This is to be called by

Modified: branches/RELENG_1_1/OpenRTM-aist/packages/deb/dpkg_build.sh
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/dpkg_build.sh	2014-11-27 08:29:53 UTC (rev 2600)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/dpkg_build.sh	2014-12-03 07:01:12 UTC (rev 2601)
@@ -137,7 +137,9 @@
             cp $packagedir/debian/rules.not-multiarch $packagedir/debian/rules
             DEB_HOST_ARCH=`dpkg-architecture -qDEB_HOST_ARCH`
             if test "x$DEB_HOST_ARCH" = "xamd64" ; then
-                sed -i -s 's/i386/x86_64/' $packagedir/debian/rules
+                sed -i -s 's/lib-arch/lib64/' $packagedir/debian/rules
+            else
+                sed -i -s 's/lib-arch/lib/' $packagedir/debian/rules
             fi
             mv $packagedir/debian/control /tmp/control.$$
             cp $packagedir/debian/control.not-multiarch $packagedir/debian/control