2008-01-29 Marcus Brinkmann <marcus@g10code.de>
authorMarcus Brinkmann <mb@g10code.com>
Tue, 29 Jan 2008 12:34:27 +0000 (12:34 +0000)
committerMarcus Brinkmann <mb@g10code.com>
Tue, 29 Jan 2008 12:34:27 +0000 (12:34 +0000)
* src/make-msi.pl (nsis_parse_line): Skip including the file
Memento.nsh.

ChangeLog
src/make-msi.pl

index c514ae4..51991d8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-29  Marcus Brinkmann  <marcus@g10code.de>
+
+       * src/make-msi.pl (nsis_parse_line): Skip including the file
+       Memento.nsh.
+
 2008-01-28  Marcus Brinkmann  <marcus@g10code.de>
 
        * packages/packages.current: Update gpgme and kleopatra.
index 4d0cada..06773fe 100644 (file)
@@ -503,13 +503,20 @@ sub nsis_parse_line
        {
            fail "$file:$.: syntax error" if $#tokens != 1;
 
-           print STDERR "Including $tokens[1]\n"
-               if $::nsis_parser_debug;
-
-           my $filename = nsis_eval ($parser, $file, $tokens[1]);
-
-           # Recursion.
-           nsis_parse_file ($parser, $filename);
+           if ($tokens[1] eq 'Memento.nsh')
+           {
+               print STDERR "Skipping $tokens[1]\n"
+                   if $::nsis_parser_debug;
+           }
+           else
+           {       print STDERR "Including $tokens[1]\n"
+                       if $::nsis_parser_debug;
+                   
+                   my $filename = nsis_eval ($parser, $file, $tokens[1]);
+                   
+                   # Recursion.
+                   nsis_parse_file ($parser, $filename);
+           }
        }
        elsif ($tokens[0] eq '!macro')
        {