[openrtm-commit:01511] r2602 - in tags/RELEASE_1_1_1/OpenRTM-aist: . packages/deb packages/deb/debian

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2014-12-03 16:13:27 +0900 (Wed, 03 Dec 2014)
New Revision: 2602

Modified:
   tags/RELEASE_1_1_1/OpenRTM-aist/
   tags/RELEASE_1_1_1/OpenRTM-aist/packages/deb/debian/rules.not-multiarch
   tags/RELEASE_1_1_1/OpenRTM-aist/packages/deb/dpkg_build.sh
Log:
[merge] r2601 has been merged from branches/RELENG_1_1.


Property changes on: tags/RELEASE_1_1_1/OpenRTM-aist
___________________________________________________________________
Modified: svn:mergeinfo
   - /tags/RELEASE_1_1_0/OpenRTM-aist:2364-2372
/tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208,2213,2328,2346,2381-2383,2389-2393,2397-2398,2400-2401,2409,2411-2412,2512-2513,2515-2516,2522-2525,2530-2531,2534-2539,2542-2543,2545-2546,2548-2566,2568,2573-2574,2592
   + /branches/RELENG_1_1/OpenRTM-aist:2601
/tags/RELEASE_1_1_0/OpenRTM-aist:2364-2372
/tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208,2213,2328,2346,2381-2383,2389-2393,2397-2398,2400-2401,2409,2411-2412,2512-2513,2515-2516,2522-2525,2530-2531,2534-2539,2542-2543,2545-2546,2548-2566,2568,2573-2574,2592

Modified: tags/RELEASE_1_1_1/OpenRTM-aist/packages/deb/debian/rules.not-multiarch
===================================================================
--- tags/RELEASE_1_1_1/OpenRTM-aist/packages/deb/debian/rules.not-multiarch	2014-12-03 07:01:12 UTC (rev 2601)
+++ tags/RELEASE_1_1_1/OpenRTM-aist/packages/deb/debian/rules.not-multiarch	2014-12-03 07:13:27 UTC (rev 2602)
@@ -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: tags/RELEASE_1_1_1/OpenRTM-aist/packages/deb/dpkg_build.sh
===================================================================
--- tags/RELEASE_1_1_1/OpenRTM-aist/packages/deb/dpkg_build.sh	2014-12-03 07:01:12 UTC (rev 2601)
+++ tags/RELEASE_1_1_1/OpenRTM-aist/packages/deb/dpkg_build.sh	2014-12-03 07:13:27 UTC (rev 2602)
@@ -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