mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-25 18:05:33 +02:00
Fix for Autotools bug #375007.
- allow configure command to be specified with absolute path
This commit is contained in:
parent
1e9ebf883d
commit
b4ca67ad3f
2 changed files with 19 additions and 6 deletions
|
@ -1,3 +1,10 @@
|
|||
2012-04-11 Jeff Johnston <jjohnstn@redhat.com>
|
||||
|
||||
Bug #375007 fix from Anna Dushistova
|
||||
* src/org/eclipse.cdt/internal/autotools/core/AutotoolsNewMakeGenerator.java
|
||||
(getConfigurePath): If configure command is specified as absolute
|
||||
path, just use it.
|
||||
|
||||
2012-03-30 Jeff Johnston <jjohnstn@redhat.com>
|
||||
|
||||
Bug #371277
|
||||
|
|
|
@ -1,12 +1,13 @@
|
|||
/*******************************************************************************
|
||||
* Copyright (c) 2009 Red Hat Inc..
|
||||
* Copyright (c) 2009, 2012 Red Hat Inc.and others.
|
||||
* All rights reserved. This program and the accompanying materials
|
||||
* are made available under the terms of the Eclipse Public License v1.0
|
||||
* which accompanies this distribution, and is available at
|
||||
* http://www.eclipse.org/legal/epl-v10.html
|
||||
*
|
||||
* Contributors:
|
||||
* Red Hat Incorporated - initial API and implementation
|
||||
* Red Hat Incorporated - initial API and implementation
|
||||
* Anna Dushistova (MontaVista)- [375007] [autotools] allow absolute paths for configure scripts
|
||||
*******************************************************************************/
|
||||
package org.eclipse.cdt.internal.autotools.core;
|
||||
|
||||
|
@ -753,10 +754,15 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
|
|||
for (int i = 1; i < tokens.length; ++i)
|
||||
cmdParms.add(tokens[i]);
|
||||
}
|
||||
if (srcDir.equals(""))
|
||||
configPath = project.getLocation().append(command);
|
||||
else
|
||||
configPath = project.getLocation().append(srcDir).append(command);
|
||||
if (Path.fromOSString(command).isAbsolute()) {
|
||||
configPath = new Path(command);
|
||||
} else {
|
||||
if (srcDir.equals(""))
|
||||
configPath = project.getLocation().append(command);
|
||||
else
|
||||
configPath = project.getLocation().append(srcDir)
|
||||
.append(command);
|
||||
}
|
||||
return configPath;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue