From f9a8d027bb496092ebe8a082426ab74ffdfe2cbc Mon Sep 17 00:00:00 2001 From: Adrian Bienkowski Date: Thu, 18 Feb 2010 22:09:12 +0800 Subject: 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. --- src/main/java/org/apache/maven/plugin/nar/NarLayout21.java | 6 +++--- 1 file 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 +} -- cgit v1.2.3