[DRE-commits] r5220 - trunk/libodbc-ruby/debian

[Daigo Moriwaki]

Author: daigo
Date: 2010-05-07 03:26:53 +0000 (Fri, 07 May 2010)
New Revision: 5220

Modified:
   trunk/libodbc-ruby/debian/rules
Log:
Correctly build binaries for both ruby 1.8 and 1.9.1


Modified: trunk/libodbc-ruby/debian/rules
===================================================================
--- trunk/libodbc-ruby/debian/rules	2010-05-06 18:51:04 UTC (rev 5219)
+++ trunk/libodbc-ruby/debian/rules	2010-05-07 03:26:53 UTC (rev 5220)
@@ -13,38 +13,50 @@
 
 
 configure/libodbc-ruby$(ruby_ver1.8)::
-	[ -e Makefile ] || ruby$(ruby_ver1.8) -Cext extconf.rb --enable-dlopen
-	[ -e utf8/Makefile ] || ruby$(ruby_ver1.8) -Cext/utf8 extconf.rb --enable-dlopen
+	cp -r ext ext$(ruby_ver1.8)
+	( cd ext$(ruby_ver1.8) && \
+	  ([ -e Makefile ] || ruby$(ruby_ver1.8) extconf.rb --enable-dlopeni) )
+	( cd ext$(ruby_ver1.8) && \
+	  ([ -e utf8/Makefile ] || ruby$(ruby_ver1.8) -Cutf8 extconf.rb --enable-dlopen) )
 
 build/libodbc-ruby$(ruby_ver1.8)::
-	[ -e odbc.so ] || $(MAKE) -Cext
-	[ -e utf8/odbc_utf8.so ] || $(MAKE) -Cext/utf8
+	( cd ext$(ruby_ver1.8) && \
+	  ([ -e odbc.so ] || $(MAKE)) )
+	( cd ext$(ruby_ver1.8) && \
+	  ([ -e utf8/odbc_utf8.so ] || $(MAKE) -Cutf8) )
 
 install/libodbc-ruby$(ruby_ver1.8)::
-	$(MAKE) -Cext install DESTDIR=$(CURDIR)/debian/libodbc-ruby$(ruby_ver1.8) sitedir='$$(prefix)/lib/ruby'
-	$(MAKE) -Cext/utf8 install DESTDIR=$(CURDIR)/debian/libodbc-ruby$(ruby_ver1.8) sitedir='$$(prefix)/lib/ruby'
+	$(MAKE) -Cext$(ruby_ver1.8) install DESTDIR=$(CURDIR)/debian/libodbc-ruby$(ruby_ver1.8) sitedir='$$(prefix)/lib/ruby'
+	$(MAKE) -Cext$(ruby_ver1.8)/utf8 install DESTDIR=$(CURDIR)/debian/libodbc-ruby$(ruby_ver1.8) sitedir='$$(prefix)/lib/ruby'
 
 cleanbuilddir/libodbc-ruby$(ruby_ver1.8)::
-	[ ! -e Makefile ] || $(MAKE) -Cext distclean
-	[ ! -e utf8/Makefile ] || $(MAKE) -Cext/utf8 distclean
+	[ ! -e ext$(ruby_ver1.8)/Makefile ] || $(MAKE) -C ext$(ruby_ver1.8) distclean
+	[ ! -e ext$(ruby_ver1.8)/utf8/Makefile ] || $(MAKE) -C ext$(ruby_ver1.8)/utf8 distclean
 
 
 configure/libodbc-ruby$(ruby_ver1.9.1)::
-	[ -e Makefile ] || ruby$(ruby_ver1.9.1) -Cext extconf.rb --enable-dlopen
-	[ -e utf8/Makefile ] || ruby$(ruby_ver1.9.1) -Cext/utf8 extconf.rb --enable-dlopen
+	cp -r ext ext$(ruby_ver1.9.1)
+	( cd ext$(ruby_ver1.9.1) && \
+	  ([ -e Makefile ] || ruby$(ruby_ver1.9.1) extconf.rb --enable-dlopeni) )
+	( cd ext$(ruby_ver1.9.1) && \
+	  ([ -e utf8/Makefile ] || ruby$(ruby_ver1.9.1) -Cutf8 extconf.rb --enable-dlopen) )
 
 build/libodbc-ruby$(ruby_ver1.9.1)::
-	[ -e odbc.so ] || $(MAKE) -Cext
-	[ -e utf8/odbc_utf8.so ] || $(MAKE) -Cext/utf8
+	( cd ext$(ruby_ver1.9.1) && \
+	  ([ -e odbc.so ] || $(MAKE)) )
+	( cd ext$(ruby_ver1.9.1) && \
+	  ([ -e utf8/odbc_utf8.so ] || $(MAKE) -Cutf8) )
 
 install/libodbc-ruby$(ruby_ver1.9.1)::
-	$(MAKE) -Cext install DESTDIR=$(CURDIR)/debian/libodbc-ruby$(ruby_ver1.9.1) sitedir='$$(prefix)/lib/ruby'
-	$(MAKE) -Cext/utf8 install DESTDIR=$(CURDIR)/debian/libodbc-ruby$(ruby_ver1.9.1) sitedir='$$(prefix)/lib/ruby'
+	$(MAKE) -Cext$(ruby_ver1.9.1) install DESTDIR=$(CURDIR)/debian/libodbc-ruby$(ruby_ver1.9.1) sitedir='$$(prefix)/lib/ruby'
+	$(MAKE) -Cext$(ruby_ver1.9.1)/utf8 install DESTDIR=$(CURDIR)/debian/libodbc-ruby$(ruby_ver1.9.1) sitedir='$$(prefix)/lib/ruby'
 
 cleanbuilddir/libodbc-ruby$(ruby_ver1.9.1)::
-	[ ! -e Makefile ] || $(MAKE) -Cext distclean
-	[ ! -e utf8/Makefile ] || $(MAKE) -Cext/utf8 distclean
+	[ ! -e ext$(ruby_ver1.9.1)/Makefile ] || $(MAKE) -C ext$(ruby_ver1.9.1) distclean
+	[ ! -e ext$(ruby_ver1.9.1)/utf8/Makefile ] || $(MAKE) -C ext$(ruby_ver1.9.1)/utf8 distclean
 
 clean::
-	- $(MAKE) -Cext distclean
-	- $(MAKE) -Cext/utf distclean
+	for v in $(ruby_ver1.8) $(ruby_ver1.9.1) ; do \
+	  rm -rf ext$$v ; \
+	done
+