subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From i...@apache.org
Subject svn commit: r1504947 - /subversion/trunk/build/generator/gen_win_dependencies.py
Date Fri, 19 Jul 2013 17:34:32 GMT
Author: ivan
Date: Fri Jul 19 17:34:32 2013
New Revision: 1504947

URL: http://svn.apache.org/r1504947
Log:
Follow-up to r1504501: fix typo in Windows build generator.

* build/generator/gen_win_dependencies.py
  (_find_apr, _find_apr_util_and_expat): Use inc_base instead of undefined 
   yet inc_path.

Modified:
    subversion/trunk/build/generator/gen_win_dependencies.py

Modified: subversion/trunk/build/generator/gen_win_dependencies.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win_dependencies.py?rev=1504947&r1=1504946&r2=1504947&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win_dependencies.py (original)
+++ subversion/trunk/build/generator/gen_win_dependencies.py Fri Jul 19 17:34:32 2013
@@ -300,7 +300,7 @@ class GenDependenciesBase(gen_base.Gener
 
     if os.path.isfile(os.path.join(inc_base, 'apr-1', 'apr_version.h')):
       inc_path = os.path.join(inc_base, 'apr-1')
-    elif os.path.isfile(os.path.join(inc_path, 'apr_version.h')):
+    elif os.path.isfile(os.path.join(inc_base, 'apr_version.h')):
       inc_path = inc_base
     else:
       sys.stderr.write("ERROR: '%s' not found.\n" % version_file_path)
@@ -382,7 +382,7 @@ class GenDependenciesBase(gen_base.Gener
 
     if os.path.isfile(os.path.join(inc_base, 'apr-1', 'apu_version.h')):
       inc_path = os.path.join(inc_base, 'apr-1')
-    elif os.path.isfile(os.path.join(inc_path, 'apu_version.h')):
+    elif os.path.isfile(os.path.join(inc_base, 'apu_version.h')):
       inc_path = inc_base
     else:
       sys.stderr.write("ERROR: 'apu_version' not found.\n")



Mime
View raw message