diff options
| author | Clemens Gruber | 2013-07-25 18:25:09 +0200 |
|---|---|---|
| committer | Adam Vandenberg | 2013-07-30 09:36:08 -0700 |
| commit | 1c295f413db854dfed184b2684f7a68069d55b4a (patch) | |
| tree | fb012656df61afe916f86c4f333db617202c2843 /Library/Formula/subversion.rb | |
| parent | a3424a36ee86a902412c32bc9327fe922e60d45f (diff) | |
| download | homebrew-1c295f413db854dfed184b2684f7a68069d55b4a.tar.bz2 | |
subversion: fix svn-tools warning
Closes #21435.
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Diffstat (limited to 'Library/Formula/subversion.rb')
| -rw-r--r-- | Library/Formula/subversion.rb | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/Library/Formula/subversion.rb b/Library/Formula/subversion.rb index 3503a714d..0ac11ea38 100644 --- a/Library/Formula/subversion.rb +++ b/Library/Formula/subversion.rb @@ -30,17 +30,10 @@ class Subversion < Formula # If building bindings, allow non-system interpreters env :userpaths if build.include? 'perl' or build.include? 'ruby' + # One patch to prevent '-arch ppc' from being pulled in from Perl's $Config{ccflags}, + # and another one to put the svn-tools directory into libexec instead of bin def patches - ps = [] - - # Patch to prevent '-arch ppc' from being pulled in from Perl's $Config{ccflags} - if build.include? 'perl' - ps << DATA - end - - unless ps.empty? - { :p0 => ps } - end + { :p0 => DATA } end # When building Perl or Ruby bindings, need to use a compiler that @@ -120,14 +113,6 @@ class Subversion < Formula system "make tools" system "make install-tools" - %w[ - svn-populate-node-origins-index - svn-rep-sharing-stats - svnauthz-validate - svnraisetreeconflict - ].each do |prog| - bin.install_symlink bin/"svn-tools"/prog - end python do system "make swig-py" @@ -170,7 +155,11 @@ class Subversion < Formula end def caveats - s = "" + s = <<-EOS.undent + svntools have been installed to: + #{opt_prefix}/libexec + + EOS s += python.standard_caveats if python @@ -223,3 +212,15 @@ __END__ INC => join(' ', $includes, $cppflags, " -I$swig_srcdir/perl/libsvn_swig_perl", " -I$svnlib_srcdir/include", + +--- Makefile.in~ 2013-07-25 16:55:27.000000000 +0200 ++++ Makefile.in 2013-07-25 17:02:02.000000000 +0200 +@@ -85,7 +85,7 @@ + swig_pydir_extra = @libdir@/svn-python/svn + swig_pldir = @libdir@/svn-perl + swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/svn/ext +-toolsdir = @bindir@/svn-tools ++toolsdir = @libexecdir@/svn-tools + + javahl_javadir = @libdir@/svn-javahl + javahl_javahdir = @libdir@/svn-javahl/include |