- fixed "already defined" error

- fixed unused label warning


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3654 212acab6-be3b-0410-9dea-997c60f758d6

Include/Library.nsh

@@ -225,6 +225,8 @@ Example:
 
   !ifndef LIBRARY_VERSION_NONE
 
+    !define LIBRARY_DEFINE_UPGRADE_LABEL
+
     StrCpy $R0 ${LIBRARY_VERSION_HIGH}
     StrCpy $R1 ${LIBRARY_VERSION_LOW}
 
@@ -268,15 +270,25 @@ Example:
 
     !undef LIBRARY_VERSION_NONE
 
+    !ifdef INSTALLLIB_LIBTYPE_TLB | INSTALLLIB_LIBTYPE_REGDLLTLB
+
       !execute '"${NSISDIR}\Contrib\LIBRARY\LIBRARYLocal\LibraryLocal.exe" T ${LOCALFILE}'
       !include "${NSISDIR}\Contrib\LIBRARY\LIBRARYLocal\LibraryLocal.nsh"
 
     !endif
 
+  !endif
+
   !ifdef INSTALLLIB_LIBTYPE_TLB | INSTALLLIB_LIBTYPE_REGDLLTLB
 
     !ifndef LIBRARY_VERSION_NONE
 
+      !ifndef LIBRARY_DEFINE_UPGRADE_LABEL
+
+        !define LIBRARY_DEFINE_UPGRADE_LABEL
+
+      !endif
+
       StrCpy $R0 ${LIBRARY_VERSION_HIGH}
       StrCpy $R1 ${LIBRARY_VERSION_LOW}
 
@@ -302,8 +314,14 @@ Example:
   ;------------------------
   ;Upgrade
 
+  !ifdef LIBRARY_DEFINE_UPGRADE_LABEL
+
+    !undef LIBRARY_DEFINE_UPGRADE_LABEL
+
     installlib.upgrade_${INSTALLLIB_UNIQUE}:
 
+  !endif
+
   ;------------------------
   ;Copy