summaryrefslogtreecommitdiff
path: root/src/main/java/org/apache
diff options
context:
space:
mode:
authorAdrian Bienkowski <abienkow@arizona.(none)>2010-02-18 22:09:12 +0800
committerMark Donszelmann <Mark.Donszelmann@gmail.com>2010-02-21 05:41:38 +0800
commitf9a8d027bb496092ebe8a082426ab74ffdfe2cbc (patch)
tree461b51707edd0edbca07e02f8dcac0609d09cd4a /src/main/java/org/apache
parentf6563341a8f3a9d88fe00c048156bb7e3fb44f4f (diff)
downloadmaven-nar-plugin-f9a8d027bb496092ebe8a082426ab74ffdfe2cbc.tar.gz
maven-nar-plugin-f9a8d027bb496092ebe8a082426ab74ffdfe2cbc.tar.bz2
maven-nar-plugin-f9a8d027bb496092ebe8a082426ab74ffdfe2cbc.tar.xz
maven-nar-plugin-f9a8d027bb496092ebe8a082426ab74ffdfe2cbc.zip
When using GNU make where projects have both executable and a libarary produced as the output, ie. target/nar/gnu/.../target/bin && .../lib the libs.binding in the properties file will be set to executable not static as specified in the pom.xml file.
Diffstat (limited to 'src/main/java/org/apache')
-rw-r--r--src/main/java/org/apache/maven/plugin/nar/NarLayout21.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarLayout21.java b/src/main/java/org/apache/maven/plugin/nar/NarLayout21.java
index 6d8433b..bf06c95 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarLayout21.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarLayout21.java
@@ -158,12 +158,12 @@ public class NarLayout21
else
{
// and not set or override if SHARED
- if ( ( narInfo.getBinding( aol, null ) == null ) || type.equals( Library.SHARED ) )
+ if ( ( narInfo.getBinding( aol, null ) == null ) || !type.equals( Library.SHARED ) )
{
narInfo.setBinding( aol, type );
}
// and not set or override if SHARED
- if ( ( narInfo.getBinding( null, null ) == null ) || type.equals( Library.SHARED ) )
+ if ( ( narInfo.getBinding( null, null ) == null ) || !type.equals( Library.SHARED ) )
{
narInfo.setBinding( null, type );
}
@@ -218,4 +218,4 @@ public class NarLayout21
FileUtils.basename( narFile.getPath(), "." + NarConstants.NAR_EXTENSION ));
return dir;
}
-} \ No newline at end of file
+}