diff -purN --exclude=configure ../setup/ChangeLog ./ChangeLog
--- ../setup/ChangeLog	Fri Jun 14 18:44:05 2002
+++ ./ChangeLog	Fri Jun 14 18:47:17 2002
@@ -1,3 +1,16 @@
+2002-03-19  Jan Nieuwenhuizen  <janneke@gnu.org>		      
+								      
+	* Forward port patch to cvs -r setup-200206 -D20020614.
+								      
+	* desktop.cc: Remove spurious line breaks from etc_profile.   
+	(make_lily_bat): New function.				      
+	(save_icon): Parametrize.				      
+	(do_desktop_setup): LilyPond support; disable Cygwin support. 
+								      
+	* res.rc: Adapt for LilyPond.				      
+								      
+	* ini.cc (fprintf): Cygwin -> GNU LilyPond		      
+								      
 2002-06-10  Robert Collins  <rbtcollins@hotmail.com>
 
         * IniParseFindVisitor (IniParseFindVisitor::visitFile): Apply Max
diff -purN --exclude=configure ../setup/bz2lib/configure.in ./bz2lib/configure.in
--- ../setup/bz2lib/configure.in	Fri Jun 14 18:45:37 2002
+++ ./bz2lib/configure.in	Fri Jun 14 18:46:33 2002
@@ -7,7 +7,7 @@ AC_CONFIG_AUX_DIR(../cfgaux)
 AM_INIT_AUTOMAKE(libbz2, 0.0)
 AM_MAINTAINER_MODE
 
-CPPFLAGS=-U_WIN32
+CPPFLAGS="$CPPFLAGS -U_WIN32"
 AC_CANONICAL_HOST
 AC_PROG_CC
 AC_PROG_RANLIB
diff -purN --exclude=configure ../setup/desktop.cc ./desktop.cc
--- ../setup/desktop.cc	Fri Jun 14 12:51:31 2002
+++ ./desktop.cc	Fri Jun 14 18:46:40 2002
@@ -87,9 +87,7 @@ static const char *etc_profile[] = {
   "done",
   "",
   "export MAKE_MODE=unix",
-  "export PS1='\\[\\033]0;\\w\\007",
-  "\\033[32m\\]\\u@\\h \\[\\033[33m\\w\\033[0m\\]",
-  "$ '",
+  "export PS1='\\[\\033]0;\\w\\007\\033[32m\\]\\u@\\h \\[\\033[33m\\w\\033[0m\\]$ '",
   "",
   "cd \"$HOME\"",
   0
@@ -216,6 +214,34 @@ make_cygwin_bat ()
 }
 
 static void
+make_lily_bat ()
+{
+  batname = backslash (cygpath ("/lilypond.bat"));
+
+  /* if the batch file exists, don't overwrite it */
+  if (_access (batname.cstr_oneuse (), 0) == 0)
+    return;
+
+  FILE *bat = fopen (batname.cstr_oneuse (), "wt");
+  if (!bat)
+    return;
+
+  fprintf (bat, "@echo off\n\n");
+
+  fprintf (bat, "%.2s\n", get_root_dir ().cstr_oneuse ());
+  fprintf (bat, "chdir %s\n\n",
+	   backslash (get_root_dir () + "/bin").cstr_oneuse ());
+
+  if (_access (cygpath ("/usr/bin/rxvt").cstr_oneuse (), 0) == 0)
+    fprintf (bat, "rxtv -e /bin/bash --login -i \n");
+  else
+    /* fprintf (bat, "bash --rcfile /bin/lilypond-profile\n"); */
+    fprintf (bat, "bash --login -i\n");
+
+  fclose (bat);
+}
+
+static void
 make_etc_profile ()
 {
   String fname = cygpath ("/etc/profile");
@@ -309,13 +335,13 @@ make_passwd_group ()
     fprintf (p, "bin\\mkgroup -l > etc\\group\n");
   fclose (p);
 }
-
+ 
 static void
-save_icon ()
+save_icon (char const* iconfile, char const* iconres)
 {
-  iconname = backslash (cygpath ("/cygwin.ico"));
-
-  HRSRC rsrc = FindResource (NULL, "CYGWIN.ICON", "FILE");
+  iconname = backslash (cygpath (iconfile));
+  
+  HRSRC rsrc = FindResource (NULL, iconres, "FILE");
   if (rsrc == NULL)
     {
       fatal ("FindResource failed");
@@ -335,12 +361,13 @@ save_icon ()
 static void
 do_desktop_setup ()
 {
-  save_icon ();
+  save_icon ("/cygwin.ico", "CYGWIN.ICON");
 
   make_cygwin_bat ();
   make_etc_profile ();
   make_passwd_group ();
 
+#if 0  
   if (root_menu)
     {
       start_menu ("Cygwin Bash Shell", batname);
@@ -349,6 +376,20 @@ do_desktop_setup ()
   if (root_desktop)
     {
       desktop_icon ("Cygwin", batname);
+    }
+#endif
+  
+  save_icon ("/LilyPond.ico", "LILYPOND.ICON");
+  make_lily_bat ();
+  
+  if (root_menu)
+    {
+      start_menu ("GNU LilyPond Shell", batname);
+    }
+ 
+  if (root_desktop)
+    {
+      desktop_icon ("GNU LilyPond", batname);
     }
 }
 
diff -purN --exclude=configure ../setup/ini.cc ./ini.cc
--- ../setup/ini.cc	Fri Jun 14 12:51:38 2002
+++ ./ini.cc	Fri Jun 14 18:46:40 2002
@@ -310,7 +310,7 @@ fprintf (FILE * f, const char *fmt, ...)
 	{
 	  *nl = 0;
 	  /*OutputDebugString (stderrbuf); */
-	  MessageBox (0, buf, "Cygwin Setup", 0);
+ 	  MessageBox (0, buf, "GNU LilyPond Setup", 0);
 	  stderrbuf[0] = 0;
 	}
 
diff -purN --exclude=configure ../setup/msg.cc ./msg.cc
--- ../setup/msg.cc	Fri Jun 14 12:51:46 2002
+++ ./msg.cc	Fri Jun 14 18:46:40 2002
@@ -47,7 +47,7 @@ mbox (HWND owner, const char *name, int 
 
   vsprintf (buf, fmt, args);
   log (LOG_PLAIN, String ("mbox ") + name + ": " + buf);
-  return MessageBox (owner, buf, "Cygwin Setup", type);
+  return MessageBox (owner, buf, "GNU LilyPond Setup", type);
 }
 
 void
diff -purN --exclude=configure ../setup/res.rc ./res.rc
--- ../setup/res.rc	Fri Jun 14 12:51:55 2002
+++ ./res.rc	Fri Jun 14 18:46:40 2002
@@ -30,7 +30,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
 
 IDD_SOURCE DIALOG DISCARDABLE  0, 0, 317, 179
 STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
-CAPTION "Cygwin Setup"
+CAPTION "GNU LilyPond Setup"
 FONT 8, "MS Sans Serif"
 BEGIN
     CONTROL         "&Install from Internet",IDC_SOURCE_NETINST,"Button",
@@ -39,7 +39,7 @@ BEGIN
                     BS_AUTORADIOBUTTON | WS_TABSTOP,101,84,115,10
     CONTROL         "Install from &Local Directory",IDC_SOURCE_CWD,"Button",
                     BS_AUTORADIOBUTTON | WS_TABSTOP,101,99,115,10
-    ICON            IDI_CYGWIN,IDC_STATIC,290,0,21,20
+    ICON            IDI_LILYPOND,IDC_STATIC,290,0,21,20
     CONTROL         "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,
                     317,1
     LTEXT           "Choose A Download Source",IDC_STATIC_HEADER_TITLE,7,0,
@@ -50,13 +50,13 @@ END
 
 IDD_LOCAL_DIR DIALOG DISCARDABLE  0, 0, 317, 179
 STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
-CAPTION "Cygwin Setup"
+CAPTION "GNU LilyPond Setup"
 FONT 8, "MS Sans Serif"
 BEGIN
     EDITTEXT        IDC_LOCAL_DIR,58,83,165,15,ES_AUTOHSCROLL | WS_GROUP
     PUSHBUTTON      "B&rowse...",IDC_LOCAL_DIR_BROWSE,223,83,34,14
     GROUPBOX        "Local Package Directory",IDC_STATIC,53,67,210,45
-    ICON            IDI_CYGWIN,IDC_STATIC,290,0,21,20
+    ICON            IDI_LILYPOND,IDC_STATIC,290,0,21,20
     CONTROL         "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,
                     317,1
     LTEXT           "Select a directory where you want Setup to store the installation files it downloads.  The directory will be created if it does not already exist.",
@@ -67,7 +67,7 @@ END
 
 IDD_ROOT DIALOG DISCARDABLE  0, 0, 317, 179
 STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
-CAPTION "Cygwin Setup"
+CAPTION "GNU LilyPond Setup"
 FONT 8, "MS Sans Serif"
 BEGIN
     GROUPBOX        "Root Directory",IDC_STATIC,5,50,305,40,WS_TABSTOP
@@ -83,7 +83,7 @@ BEGIN
                     WS_GROUP | WS_TABSTOP,170,120,90,8
     CONTROL         "&Unix",IDC_ROOT_BINARY,"Button",BS_AUTORADIOBUTTON | 
                     WS_TABSTOP,170,135,90,8
-    ICON            IDI_CYGWIN,IDC_STATIC,290,0,20,20
+    ICON            IDI_LILYPOND,IDC_STATIC,290,0,21,20
     CONTROL         "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,
                     317,1
     LTEXT           "Select the directory where you want to install Cygwin.  Also choose a few installation parameters.",
@@ -96,10 +96,10 @@ IDD_SITE DIALOG DISCARDABLE  0, 0, 317, 
 STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE | 
     WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CONTROLPARENT
-CAPTION "Cygwin Setup"
+CAPTION "GNU LilyPond Setup"
 FONT 8, "MS Sans Serif"
 BEGIN
-    ICON            IDI_CYGWIN,IDC_STATIC,290,0,20,20
+    ICON            IDI_LILYPOND,IDC_STATIC,290,0,21,20
     LISTBOX         IDC_URL_LIST,66,45,185,110,LBS_NOINTEGRALHEIGHT | 
                     LBS_EXTENDEDSEL | WS_VSCROLL | WS_HSCROLL | WS_GROUP | 
                     WS_TABSTOP
@@ -119,7 +119,7 @@ END
 
 IDD_NET DIALOG DISCARDABLE  0, 0, 317, 179
 STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
-CAPTION "Cygwin Setup"
+CAPTION "GNU LilyPond Setup"
 FONT 8, "MS Sans Serif"
 BEGIN
     CONTROL         "&Direct Connection",IDC_NET_DIRECT,"Button",
@@ -137,7 +137,7 @@ BEGIN
                     NOT WS_GROUP
     RTEXT           "Por&t",IDC_STATIC,85,125,30,12,SS_CENTERIMAGE | NOT 
                     WS_GROUP
-    ICON            IDI_CYGWIN,IDC_STATIC,290,0,21,20
+    ICON            IDI_LILYPOND,IDC_STATIC,290,0,21,20
     CONTROL         "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,
                     317,1
     LTEXT           "Setup needs to know how you want it to connect to the internet.  Choose the appropriate settings below.",
@@ -149,7 +149,7 @@ END
 IDD_INSTATUS DIALOG DISCARDABLE  0, 0, 317, 179
 STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_VISIBLE | WS_CAPTION | 
     WS_SYSMENU
-CAPTION "Cygwin Setup"
+CAPTION "GNU LilyPond Setup"
 FONT 8, "MS Sans Serif"
 BEGIN
     LTEXT           "Installing...",IDC_INS_ACTION,45,55,205,8,NOT WS_GROUP
@@ -164,7 +164,7 @@ BEGIN
     LTEXT           "Package:",IDC_INS_BL_PACKAGE,45,100,47,8,NOT WS_GROUP
     LTEXT           "Total:",IDC_INS_BL_TOTAL,45,115,48,8,NOT WS_GROUP
     LTEXT           "Disk:",IDC_INS_BL_DISK,45,130,47,8,NOT WS_GROUP
-    ICON            IDI_CYGWIN,IDC_STATIC,290,0,20,20
+    ICON            IDI_LILYPOND,IDC_STATIC,290,0,20,20
     CONTROL         "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,
                     317,1
     LTEXT           "This page displays the progress of the download or installation.",
@@ -175,10 +175,10 @@ END
 
 IDD_PROXY_AUTH DIALOG DISCARDABLE  0, 0, 215, 95
 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Cygwin Setup"
+CAPTION "GNU LilyPond Setup"
 FONT 8, "MS Sans Serif"
 BEGIN
-    ICON            IDI_CYGWIN,IDC_STATIC,5,5,20,20
+    ICON            IDI_LILYPOND,IDC_STATIC,5,5,20,20
     LTEXT           "Proxy &User ID",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE,
                     WS_EX_RIGHT
     EDITTEXT        IDC_NET_USER,65,28,145,12,ES_AUTOHSCROLL
@@ -192,10 +192,10 @@ END
 
 IDD_NET_AUTH DIALOG DISCARDABLE  0, 0, 215, 95
 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Cygwin Setup"
+CAPTION "GNU LilyPond Setup"
 FONT 8, "MS Sans Serif"
 BEGIN
-    ICON            IDI_CYGWIN,IDC_STATIC,5,5,20,20
+    ICON            IDI_LILYPOND,IDC_STATIC,5,5,20,20
     LTEXT           "&User ID",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE,
                     WS_EX_RIGHT
     EDITTEXT        IDC_NET_USER,65,28,145,12,ES_AUTOHSCROLL
@@ -206,37 +206,34 @@ BEGIN
     DEFPUSHBUTTON   "&OK",IDOK,100,75,45,15,WS_DISABLED
     PUSHBUTTON      "Cancel",IDCANCEL,165,75,45,15
 END
-
 IDD_SPLASH DIALOG DISCARDABLE  0, 0, 317, 179
 STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE | 
     WS_CAPTION | WS_SYSMENU
-CAPTION "Cygwin Setup"
+CAPTION "GNU LilyPond Setup"
 FONT 8, "MS Sans Serif"
 BEGIN
-    ICON            IDI_CYGWIN,IDC_STATIC,113,112,21,20,WS_GROUP
-#    CONTROL         "",IDC_STATIC,"Static",SS_WHITERECT,0,0,95,178
-    LTEXT           "Version (unknown)",IDC_VERSION,115,137,195,10
-    LTEXT           "Cygwin Net Release Setup Program",
+    ICON            IDI_LILYPOND,IDC_STATIC,113,112,21,20,WS_GROUP
+    CONTROL         "",IDC_STATIC,"Static",SS_WHITERECT,0,0,95,178
+    LTEXT           "Version (1.4.12)",IDC_VERSION,115,137,195,10
+    LTEXT           "GNU LilyPond Setup Program",
                     IDC_STATIC_WELCOME_TITLE,115,1,195,24
-    LTEXT           "Copyright 2000, 2001 Red Hat Inc.",IDC_STATIC,115,150,
-                    195,8
-    LTEXT           "http://sources.redhat.com/cygwin/",IDC_STATIC,115,162,
-                    195,8
-    LTEXT           "This wizard will guide you through the installation and updating of the Cygwin environment and a plethora of GNU packages.",
-                    IDC_STATIC,115,33,195,54
+    LTEXT           "Copyright (C) 2000, 2001, 2002 Red Hat Inc.",
+			IDC_STATIC,115,138,195,8
+    LTEXT           "                (C) 2001, 2002 Jan Nieuwenhuizen <janneke@gnu.org>",IDC_STATIC,115,150,195,8
+    LTEXT           "http://www.lilypond.org/cygwin/",IDC_STATIC,115,162,195,8
+    LTEXT           "This wizard will guide you through the installation and updating LilyPond and all other necessary Cygwin packages.",IDC_STATIC,115,33,195,54
 END
-
 IDD_DESKTOP DIALOG DISCARDABLE  0, 0, 317, 179
 STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE | 
     WS_CAPTION | WS_SYSMENU
-CAPTION "Cygwin Setup"
+CAPTION "GNU LilyPond Setup"
 FONT 8, "MS Sans Serif"
 BEGIN
     CONTROL         "Create icon on &Desktop",IDC_ROOT_DESKTOP,"Button",
                     BS_AUTOCHECKBOX,108,78,100,8
     CONTROL         "Add icon to &Start Menu",IDC_ROOT_MENU,"Button",
                     BS_AUTOCHECKBOX,108,93,100,8
-    ICON            IDI_CYGWIN,IDC_STATIC,290,0,21,20
+    ICON            IDI_LILYPOND,IDC_STATIC,290,0,21,20
     CONTROL         "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,
                     317,1
     LTEXT           "Tell setup if you want it to create a few icons for convenient access to the Cygwin environment.",
@@ -247,10 +244,10 @@ END
 
 IDD_FTP_AUTH DIALOG DISCARDABLE  0, 0, 215, 95
 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Cygwin Setup"
+CAPTION "GNU LilyPond Setup"
 FONT 8, "MS Sans Serif"
 BEGIN
-    ICON            IDI_CYGWIN,IDC_STATIC,5,5,20,20
+    ICON            IDI_LILYPOND,IDC_STATIC,5,5,20,20
     LTEXT           "&User ID",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE,
                     WS_EX_RIGHT
     EDITTEXT        IDC_NET_USER,65,28,145,12,ES_AUTOHSCROLL
@@ -265,7 +262,7 @@ END
 IDD_CHOOSE DIALOG DISCARDABLE  0, 0, 317, 179
 STYLE DS_MODALFRAME | DS_3DLOOK | WS_CHILD | WS_VISIBLE | WS_CAPTION | 
     WS_SYSMENU
-CAPTION "Cygwin Setup"
+CAPTION "GNU LilyPond Setup"
 FONT 8, "MS Sans Serif"
 BEGIN
     CONTROL         "&Prev",IDC_CHOOSE_PREV,"Button",BS_AUTORADIOBUTTON | 
@@ -279,7 +276,7 @@ BEGIN
                     317,1
     CONTROL         "",IDC_LISTVIEW_POS,"Static",SS_BLACKFRAME | NOT 
                     WS_VISIBLE,7,41,303,134
-    ICON            IDI_CYGWIN,IDC_STATIC,290,0,20,20
+    ICON            IDI_LILYPOND,IDC_STATIC,290,0,20,20
     LTEXT           "Select the packages you want setup to install.",
                     IDC_STATIC,21,9,239,16,NOT WS_GROUP
     LTEXT           "Select Packages",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT 
@@ -323,6 +320,7 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
+IDI_LILYPOND            ICON    DISCARDABLE     "LilyPond.ico"
 IDI_CYGWIN              ICON    DISCARDABLE     "cygwin.ico"
 
 /////////////////////////////////////////////////////////////////////////////
@@ -330,6 +328,7 @@ IDI_CYGWIN              ICON    DISCARDA
 // FILE
 //
 
+LILYPOND.ICON           FILE    DISCARDABLE     "LilyPond.ico"
 CYGWIN.ICON             FILE    DISCARDABLE     "cygwin.ico"
 
 /////////////////////////////////////////////////////////////////////////////
@@ -434,7 +433,7 @@ STRINGTABLE DISCARDABLE 
 BEGIN
     IDS_ROOT_SLASH          "Warning: we recommend you do NOT use the root of your hard drive as the cygwin root.  Proceed anyway?"
     IDS_ROOT_SPACE          "You should not choose a root path that include spaces in directory names.  Proceed anyway?"
-    IDS_MIRROR_LST          "http://sources.redhat.com/cygwin/mirrors.lst"
+    IDS_MIRROR_LST          "http://www.lilypond.org/cygwin/mirrors.lst"
     IDS_DIALOG_FAILED       "Unable to create Dialog Box"
     IDS_CYGWIN_FUNC_MISSING "Error: unable to find function `%s' in %s"
     IDS_DOWNLOAD_SHORT      "Download error: %s too short (%d, wanted %d)"
@@ -443,7 +442,7 @@ BEGIN
     IDS_OLD_SETUPINI        "This setup.ini is older than the one you used last time you installed cygwin.  Proceed anyway?"
     IDS_ERR_RENAME          "Can't rename %s to %s: %s"
     IDS_NOTHING_INSTALLED   "Nothing needed to be installed"
-    IDS_INSTALL_COMPLETE    "Installation Complete"
+    IDS_INSTALL_COMPLETE    "Installation Complete.  See http://www.lilypond.org/cygwin/ for support."
     IDS_REBOOT_REQUIRED     "In-use files have been replaced. You need to reboot as soon as possible to activate the new versions. Cygwin may operate incorrectly until you reboot."
 END
 
diff -purN --exclude=configure ../setup/resource.h ./resource.h
--- ../setup/resource.h	Fri Jun 14 12:51:55 2002
+++ ./resource.h	Fri Jun 14 18:46:40 2002
@@ -50,13 +50,14 @@
 #define IDB_SPIN                        118
 #define IDB_RTARROW                     119
 #define IDI_SPIN                        120
-#define IDI_CYGWIN                      121
+#define IDI_LILYPOND                    121
 #define IDD_LOCAL_DIR                   122
 #define IDB_CHECK_YES                   123
 #define IDB_CHECK_NO                    124
 #define IDB_CHECK_NA                    125
 #define IDD_FTP_AUTH                    126
 #define IDD_CHOOSER                     127
+#define IDI_CYGWIN                      128
 #define IDC_SOURCE_DOWNLOAD             1000
 #define IDC_SOURCE_NETINST              1001
 #define IDC_SOURCE_CWD                  1002
