Bug 746223 - remove nsinstall's -l flag; r=glandium

config/nsinstall.c

@@ -285,15 +285,12 @@ main(int argc, char **argv)
 	  case 'd':
 	    dodir = 1;
 	    break;
-	  case 'l':
-	    dolink = 1;
-	    break;
 	  case 'L':
 	    linkprefix = optarg;
 	    lplen = strlen(linkprefix);
 	    dolink = 1;
 	    break;
-     case 'R':
+	  case 'R':
 	    dolink = dorelsymlink = 1;
 	    break;
 	  case 'm':
@@ -389,7 +386,7 @@ main(int argc, char **argv)
 		linkname = 0;
 	    } else {
 		if (linkprefix) {
-		    /* -L implies -l and prefixes names with a $cwd arg. */
+		    /* -L prefixes names with a $cwd arg. */
 		    len += lplen + 1;
 		    linkname = xmalloc((unsigned int)(len + 1));
 		    sprintf(linkname, "%s/%s", linkprefix, name);

config/nsinstall.py

@@ -31,8 +31,6 @@ def _nsinstall_internal(argv):
                help="Create directories in target")
   p.add_option('-R', action="store_true",
                help="Use relative symbolic links (ignored)")
-  p.add_option('-l', action="store_true",
-               help="Create link (ignored)")
   p.add_option('-L', action="store", metavar="linkprefix",
                help="Link prefix (ignored)")
   p.add_option('-X', action="append", metavar="file",

js/src/config/nsinstall.c

@@ -285,15 +285,12 @@ main(int argc, char **argv)
 	  case 'd':
 	    dodir = 1;
 	    break;
-	  case 'l':
-	    dolink = 1;
-	    break;
 	  case 'L':
 	    linkprefix = optarg;
 	    lplen = strlen(linkprefix);
 	    dolink = 1;
 	    break;
-     case 'R':
+	  case 'R':
 	    dolink = dorelsymlink = 1;
 	    break;
 	  case 'm':
@@ -389,7 +386,7 @@ main(int argc, char **argv)
 		linkname = 0;
 	    } else {
 		if (linkprefix) {
-		    /* -L implies -l and prefixes names with a $cwd arg. */
+		    /* -L prefixes names with a $cwd arg. */
 		    len += lplen + 1;
 		    linkname = xmalloc((unsigned int)(len + 1));
 		    sprintf(linkname, "%s/%s", linkprefix, name);

js/src/config/nsinstall.py

@@ -31,8 +31,6 @@ def _nsinstall_internal(argv):
                help="Create directories in target")
   p.add_option('-R', action="store_true",
                help="Use relative symbolic links (ignored)")
-  p.add_option('-l', action="store_true",
-               help="Create link (ignored)")
   p.add_option('-L', action="store", metavar="linkprefix",
                help="Link prefix (ignored)")
   p.add_option('-X', action="append", metavar="file",