nobu	2010-10-26 12:47:15 +0900 (Tue, 26 Oct 2010)

  New Revision: 29595

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29595

  Log:
    * common.mk (pkgconfig-data): moved from Makefile.in.
    
    * tool/rbinstall.rb: install pc file only if non-empty.
      [ruby-core:32901] #3983
    
    * win32/Makefile.sub (ruby_pc): create pc file.

  Modified files:
    trunk/ChangeLog
    trunk/Makefile.in
    trunk/common.mk
    trunk/tool/rbinstall.rb
    trunk/win32/Makefile.sub

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 29594)
+++ ChangeLog	(revision 29595)
@@ -1,3 +1,12 @@
+Tue Oct 26 12:47:10 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* common.mk (pkgconfig-data): moved from Makefile.in.
+
+	* tool/rbinstall.rb: install pc file only if non-empty.
+	  [ruby-core:32901] #3983
+
+	* win32/Makefile.sub (ruby_pc): create pc file.
+
 Tue Oct 26 09:13:34 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* configure.in (rb_cv_gcc_atomic_builtins): check for atomic
Index: common.mk
===================================================================
--- common.mk	(revision 29594)
+++ common.mk	(revision 29595)
@@ -181,6 +181,8 @@
 
 install: install-$(INSTALLDOC)
 docs: $(DOCTARGETS)
+pkgconfig-data: $(ruby_pc)
+$(ruby_pc): $(srcdir)/template/ruby.pc.in config.status
 
 install-all: docs pre-install-all do-install-all post-install-all
 pre-install-all:: pre-install-local pre-install-ext pre-install-doc
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 29594)
+++ win32/Makefile.sub	(revision 29595)
@@ -339,6 +339,7 @@
 VCS = git
 VCSUP = $(VCS) pull $(GITPULLOPTIONS)
 !endif
+ruby_pc = $(RUBY_BASE_NAME)-$(MAJOR).$(MINOR).pc
 
 all: $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub $(srcdir)/common.mk
 
@@ -772,6 +773,7 @@
 s,@srcdir@,$(srcdir),;t t
 s,@top_srcdir@,$(srcdir),;t t
 s,@try_header@,try_compile,;t t
+s,@ruby_pc@,$(ruby_pc),;t t
 <<KEEP
 
 miniruby: miniruby$(EXEEXT)
@@ -896,6 +898,13 @@
 end
 <<KEEP
 
+$(ruby_pc): $(RBCONFIG)
+	@$(MINIRUBY) -rrbconfig -p \
+	-e '$$_.gsub!(/@([a-z_]\w*)@/i) {' \
+	-e 'RbConfig::MAKEFILE_CONFIG[$$1].gsub(/\$$\((.+?)\)/, %Q[$${\1}])'
+	-e '}' \
+	$(srcdir)/template/ruby.pc.in > $@
+
 {$(srcdir)/enc}.c.obj:
 	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c -Tc$(<:\=/)
 {$(srcdir)/missing}.c.obj:
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 29594)
+++ Makefile.in	(revision 29595)
@@ -179,8 +179,7 @@
 		@chmod +x $@
 
 ruby_pc = @ruby_pc@
-pkgconfig-data: $(ruby_pc)
-$(ruby_pc): $(srcdir)/template/ruby.pc.in config.status
+$(ruby_pc):
 		@./config.status --file=$@:$(srcdir)/template/ruby.pc.in
 
 install-cross: $(arch)-fake.rb $(RBCONFIG) rbconfig.rb $(arch_hdrdir)/ruby/config.h \
Index: tool/rbinstall.rb
===================================================================
--- tool/rbinstall.rb	(revision 29594)
+++ tool/rbinstall.rb	(revision 29595)
@@ -340,7 +340,7 @@
 
 install?(:local, :arch, :data) do
   pc = CONFIG["ruby_pc"]
-  if File.exist?(pc)
+  if pc and File.file?(pc) and File.size?(pc)
     prepare "pkgconfig data", pkgconfigdir = File.join(libdir, "pkgconfig")
     install pc, pkgconfigdir, :mode => $data_mode
   end

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/