git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fish: mount can be used instead of mount-options with libguestfs >= 1.14
[libguestfs.git]
/
ruby
/
Makefile.am
diff --git
a/ruby/Makefile.am
b/ruby/Makefile.am
index
a2e962d
..
8139140
100644
(file)
--- a/
ruby/Makefile.am
+++ b/
ruby/Makefile.am
@@
-13,7
+13,7
@@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc.,
675 Mass Ave, Cambridge, MA 02139,
USA.
+# Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA.
include $(top_srcdir)/subdir-rules.mk
include $(top_srcdir)/subdir-rules.mk
@@
-49,19
+49,20
@@
TESTS = run-bindtests run-ruby-tests
TESTS_ENVIRONMENT = \
LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
LIBGUESTFS_PATH=$(top_builddir)/appliance \
TESTS_ENVIRONMENT = \
LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
LIBGUESTFS_PATH=$(top_builddir)/appliance \
- TMPDIR=$(top_builddir)
+ TMPDIR=$(top_builddir) \
+ RUBY=$(RUBY)
all: $(generator_built)
all: $(generator_built)
-
rake
build
-
rake
rdoc
+
$(RAKE)
build
+
$(RAKE)
rdoc
-RUBY_SITELIB := $(shell
ruby
-rrbconfig -e "puts Config::CONFIG['sitelibdir']")
-RUBY_SITEARCH := $(shell
ruby
-rrbconfig -e "puts Config::CONFIG['sitearchdir']")
+RUBY_SITELIB := $(shell
$(RUBY)
-rrbconfig -e "puts Config::CONFIG['sitelibdir']")
+RUBY_SITEARCH := $(shell
$(RUBY)
-rrbconfig -e "puts Config::CONFIG['sitearchdir']")
install:
$(MKDIR_P) $(DESTDIR)$(RUBY_SITELIB)
$(MKDIR_P) $(DESTDIR)$(RUBY_SITEARCH)
install:
$(MKDIR_P) $(DESTDIR)$(RUBY_SITELIB)
$(MKDIR_P) $(DESTDIR)$(RUBY_SITEARCH)
- $(INSTALL) -p -m 0644 lib/guestfs.rb $(DESTDIR)$(RUBY_SITELIB)
- $(INSTALL) -p -m 0755 ext/guestfs/_guestfs.so $(DESTDIR)$(RUBY_SITEARCH)
+ $(INSTALL) -p -m 0644
$(srcdir)/
lib/guestfs.rb $(DESTDIR)$(RUBY_SITELIB)
+ $(INSTALL) -p -m 0755
$(builddir)/
ext/guestfs/_guestfs.so $(DESTDIR)$(RUBY_SITEARCH)
endif
endif