svn commit: r1039040 - /subversion/trunk/Makefile.in

[ph...@apache.org]

Author: philip
Date: Thu Nov 25 13:49:16 2010
New Revision: 1039040

URL: http://svn.apache.org/viewvc?rev=1039040&view=rev
Log:
Allow the SWIG Perl bindings to build without using Python.

* Makefile.in
  (READLINK): Rename to...
  (READLINK_PY): ...this.
  (READLINK_PL): New.
  (swig-pl): Use READLINK_PL.

Modified:
    subversion/trunk/Makefile.in

Modified: subversion/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/trunk/Makefile.in?rev=1039040&r1=1039039&r2=1039040&view=diff
==============================================================================
--- subversion/trunk/Makefile.in (original)
+++ subversion/trunk/Makefile.in Thu Nov 25 13:49:16 2010
@@ -723,13 +723,15 @@ $(SWIG_PL_DIR)/native/Makefile: $(SWIG_P
 	cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL
 
 # There is a "readlink -f" command on some systems for the same purpose,
-# but it's not as portable (e.g. Mac OS X doesn't have it).
-READLINK=$(PYTHON) -c 'import sys,os; print(os.path.realpath(sys.argv[1]))'
+# but it's not as portable (e.g. Mac OS X doesn't have it).  These should
+# only be used where Python/Perl are known to be available.
+READLINK_PY=$(PYTHON) -c 'import sys,os; print(os.path.realpath(sys.argv[1]))'
+READLINK_PL=$(PERL) -e 'use Cwd; print Cwd::realpath(shift)'
 
 swig-pl_DEPS = autogen-swig-pl libsvn_swig_perl \
   $(SWIG_PL_DIR)/native/Makefile
 swig-pl: $(swig-pl_DEPS)
-	if test "`$(READLINK) $(SWIG_PL_DIR)`" != "`$(READLINK) $(SWIG_PL_SRC_DIR)`"; then \
+	if test "`$(READLINK_PL) $(SWIG_PL_DIR)`" != "`$(READLINK_PL) $(SWIG_PL_SRC_DIR)`"; then \
 	  ln -sf $(SWIG_PL_SRC_DIR)/native/*.c $(SWIG_PL_DIR)/native; \
 	fi
 	cd $(SWIG_PL_DIR)/native; $(MAKE) OPTIMIZE="" OTHERLDFLAGS="$(SWIG_LDFLAGS)"