Rebase ruby patch.

This commit is contained in:
Richard W.M. Jones 2012-03-03 20:31:45 +00:00
parent 405ab42507
commit 767a370d96
2 changed files with 7 additions and 6 deletions

View File

@ -22,7 +22,7 @@ Summary: Access and modify virtual machine disk images
Name: libguestfs Name: libguestfs
Epoch: 1 Epoch: 1
Version: 1.17.10 Version: 1.17.10
Release: 1%{?dist} Release: 2%{?dist}
License: LGPLv2+ License: LGPLv2+
Group: Development/Libraries Group: Development/Libraries
URL: http://libguestfs.org/ URL: http://libguestfs.org/
@ -1038,8 +1038,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Sat Mar 03 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.10-1 * Sat Mar 03 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.10-2
- New upstream version 1.17.10. - New upstream version 1.17.10.
- Rebase Ruby patch against new libguestfs.
* Wed Feb 29 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.9-1 * Wed Feb 29 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.9-1
- New upstream version 1.17.9. - New upstream version 1.17.9.

View File

@ -4,10 +4,10 @@
$(RAKE) build $(RAKE) build
$(RAKE) rdoc $(RAKE) rdoc
-RUBY_SITELIB := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['sitelibdir']") -RUBY_SITELIB := $(shell $(RUBY) -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']")
-RUBY_SITEARCH := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['sitearchdir']") -RUBY_SITEARCH := $(shell $(RUBY) -rrbconfig -e "puts RbConfig::CONFIG['sitearchdir']")
+RUBY_VENDORLIB := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['vendorlibdir']") +RUBY_VENDORLIB := $(shell $(RUBY) -rrbconfig -e "puts RbConfig::CONFIG['vendorlibdir']")
+RUBY_VENDORARCH := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['vendorarchdir']") +RUBY_VENDORARCH := $(shell $(RUBY) -rrbconfig -e "puts RbConfig::CONFIG['vendorarchdir']")
install: install:
- $(MKDIR_P) $(DESTDIR)$(RUBY_SITELIB) - $(MKDIR_P) $(DESTDIR)$(RUBY_SITELIB)