De-Cygnify libgui.

* library/Makefile.am (guidir): Name dir `redhat', not `cygnus'.
* src/Makefile.am (guidir): Same.
* library/Makefile.in, src/Makefile.in: Regenerated.
* library/sendpr.tcl (itcl_class Sendpr): Update company name in
PR headers.
* src/paths.c: Rename environment variables CYGNUS_GUI_LIBRARY
and CYGNUS_IDE_LIBRARY to REDHAT_GUI_LIBRARY and
REDHAT_IDE_LIBRARY.  Name dir `redhat', not `cygnus'.

diff --git a/libgui/ChangeLog b/libgui/ChangeLog
index 7b64a36..51032b1 100644 (file)
--- a/libgui/ChangeLog
+++ b/libgui/ChangeLog
@@ -1,3 +1,16 @@
+2002-02-05  Jim Blandy  <jimb@redhat.com>
+
+       De-Cygnify libgui.
+       
+       * library/Makefile.am (guidir): Name dir `redhat', not `cygnus'.
+       * src/Makefile.am (guidir): Same.
+       * library/Makefile.in, src/Makefile.in: Regenerated.
+       * library/sendpr.tcl (itcl_class Sendpr): Update company name in
+       PR headers.
+       * src/paths.c: Rename environment variables CYGNUS_GUI_LIBRARY
+       and CYGNUS_IDE_LIBRARY to REDHAT_GUI_LIBRARY and
+       REDHAT_IDE_LIBRARY.  Name dir `redhat', not `cygnus'.
+
 2002-01-04  Ian Roxborough  <irox@redhat.com>
 
        * src/tkCanvEdge.c (CreateEdge, EdgeCoords, ConfigureEdge):

diff --git a/libgui/library/Makefile.am b/libgui/library/Makefile.am
index 501ed46..a0aae95 100644 (file)
--- a/libgui/library/Makefile.am
+++ b/libgui/library/Makefile.am
@@ -14,7 +14,7 @@ pane.tcl panedwindow.tcl
 PACKAGES = combobox.tcl
 
 ## This directory is also referenced in paths.c, which see.
-guidir = $(datadir)/cygnus/gui
+guidir = $(datadir)/redhat/gui
 gui_DATA = tclIndex pkgIndex.tcl $(TCL) $(PACKAGES)
 
 if TCL_SHARED

diff --git a/libgui/library/Makefile.in b/libgui/library/Makefile.in
index 7121230..1fc99e0 100644 (file)
--- a/libgui/library/Makefile.in
+++ b/libgui/library/Makefile.in
@@ -154,7 +154,7 @@ pane.tcl panedwindow.tcl
 
 PACKAGES = combobox.tcl
 
-guidir = $(datadir)/cygnus/gui
+guidir = $(datadir)/redhat/gui
 gui_DATA = tclIndex pkgIndex.tcl $(TCL) $(PACKAGES)
 @TCL_SHARED_TRUE@SET_LIB_PATH = @TCL_SHARED_TRUE@$(RPATH_ENVVAR)=$$here/../../tcl/unix:$$here/../../itcl/itcl/unix:$$$(RPATH_ENVVAR); export $(RPATH_ENVVAR);
 @TCL_SHARED_FALSE@SET_LIB_PATH = 

diff --git a/libgui/library/sendpr.tcl b/libgui/library/sendpr.tcl
index d0ed0fe..fa8b8ad 100644 (file)
--- a/libgui/library/sendpr.tcl
+++ b/libgui/library/sendpr.tcl
@@ -31,7 +31,7 @@ itcl_class Sendpr {
     set _site(field,Submitter-Id) cygnus
     set _site(field,Originator) Nobody
     set _site(field,Release) "Internal"
-    set _site(field,Organization) "Cygnus Solutions"
+    set _site(field,Organization) "Red Hat, Inc."
     set _site(field,Environment) ""
     foreach item {byteOrder machine os osVersion platform} {
       append _site(field,Environment) "$item = $tcl_platform($item)\n"

diff --git a/libgui/src/Makefile.am b/libgui/src/Makefile.am
index 0be1fe3..01eea8e 100644 (file)
--- a/libgui/src/Makefile.am
+++ b/libgui/src/Makefile.am
@@ -12,7 +12,7 @@ include_HEADERS = \
 endif
 
 datadir = @datadir@
-guidir  = $(datadir)/cygnus/gui
+guidir  = $(datadir)/redhat/gui
 
 # tkTable version info
 include $(srcdir)/tkTable_version.in

diff --git a/libgui/src/Makefile.in b/libgui/src/Makefile.in
index 4ac8bca..088bd88 100644 (file)
--- a/libgui/src/Makefile.in
+++ b/libgui/src/Makefile.in
@@ -151,7 +151,7 @@ noinst_LIBRARIES = libgui.a
 @INSTALL_LIBGUI_TRUE@  guitcl.h subcommand.h
 
 datadir = @datadir@
-guidir = $(datadir)/cygnus/gui
+guidir = $(datadir)/redhat/gui
 
 TBL_MAJOR_VERSION = 2
 TBL_MINOR_VERSION = 7

diff --git a/libgui/src/paths.c b/libgui/src/paths.c
index de396e9..09c32ef 100644 (file)
--- a/libgui/src/paths.c
+++ b/libgui/src/paths.c
@@ -12,14 +12,14 @@
 /* This Tcl code sets up all the path information we care about.
 
    We first look for the gui library.  This can be set by the
-   CYGNUS_GUI_LIBRARY environment variable.  Otherwise, it is named
-   gui, and is found in $prefix/share/cygnus, where $prefix is
+   REDHAT_GUI_LIBRARY environment variable.  Otherwise, it is named
+   gui, and is found in $prefix/share/redhat, where $prefix is
    determined by looking at the directory where the running executable
    is installed.
 
    We then look for the ide library.  This can be set by the
-   CYGNUS_IDE_LIBRARY environment variable.  Otherwise, it is named
-   ide, and is also found in $prefix/share/cygnus.
+   REDHAT_IDE_LIBRARY environment variable.  Otherwise, it is named
+   ide, and is also found in $prefix/share/redhat.
 
    It is OK if only one of these libraries exist.  If neither exists,
    we report an error.
@@ -36,7 +36,7 @@
    bitmapdir      -- see below
 
    Paths(appdir) is set based on the ide_initialize_paths APPNAME
-   parameter.  If a directory $prefix/share/cygnus/APPNAME exists, we
+   parameter.  If a directory $prefix/share/redhat/APPNAME exists, we
    set Paths(appdir) to it.  More precisely, we set Paths(appdir) if
    an APPNAME directory exists which is a sibling directory of the gui
    or ide directory.  For convenience of some tools, we also check for
@@ -55,8 +55,8 @@ proc initialize_paths {} {\n\
   # First find the GUI library.\n\
   set guidirs {}\n\
   set prefdirs {}\n\
-  if [info exists env(CYGNUS_GUI_LIBRARY)] {\n\
-    lappend guidirs $env(CYGNUS_GUI_LIBRARY)\n\
+  if [info exists env(REDHAT_GUI_LIBRARY)] {\n\
+    lappend guidirs $env(REDHAT_GUI_LIBRARY)\n\
   }\n\
   set here [pwd]\n\
   set exec_name [info nameofexecutable]\n\
@@ -70,13 +70,13 @@ proc initialize_paths {} {\n\
   # Handle build with --exec-prefix and build without.\n\
   set d [file join [file dirname [pwd]] usr share]\n\
   lappend prefdirs $d\n\
-  lappend guidirs [file join $d cygnus gui]\n\
+  lappend guidirs [file join $d redhat gui]\n\
   set d [file join [file dirname [pwd]] share]\n\
   lappend prefdirs $d\n\
-  lappend guidirs [file join $d cygnus gui]\n\
+  lappend guidirs [file join $d redhat gui]\n\
   set d [file join [file dirname [file dirname [pwd]]] share]\n\
   lappend prefdirs $d\n\
-  lappend guidirs [file join $d cygnus gui]\n\
+  lappend guidirs [file join $d redhat gui]\n\
   set Paths(bindir) [pwd]\n\
        # Base `prefix' on where the `share' dir is found\n\
        foreach sd $prefdirs {\n\
@@ -103,11 +103,11 @@ proc initialize_paths {} {\n\
   }\n\
   # Now find the IDE library, if it exists.\n\
   set idedirs {}\n\
-  if [info exists env(CYGNUS_IDE_LIBRARY)] {\n\
-    lappend idedirs $env(CYGNUS_IDE_LIBRARY)\n\
+  if [info exists env(REDHAT_IDE_LIBRARY)] {\n\
+    lappend idedirs $env(REDHAT_IDE_LIBRARY)\n\
   }\n\
   foreach d $prefdirs {\n\
-    lappend idedirs [file join $d cygnus ide]\n\
+    lappend idedirs [file join $d redhat ide]\n\
   }\n\
   # Try to handle running from the build tree:\n\
   lappend idedirs [file join [file dirname [file dirname $tcl_library]] libide library]\n\
@@ -177,9 +177,9 @@ proc initialize_paths {} {\n\
   set here [pwd]\n\
   cd [file dirname [info nameofexecutable]]\n\
   set d [file join [file dirname [pwd]] share]\n\
-  lappend guidirs [file join $d cygnus gui]\n\
+  lappend guidirs [file join $d redhat gui]\n\
   set d [file join [file dirname [file dirname [pwd]]] share]\n\
-  lappend guidirs [file join $d cygnus gui]\n\
+  lappend guidirs [file join $d redhat gui]\n\
   lappend guidirs [file join [file dirname [file dirname $tcl_library]] libgui library]\n\
   foreach sd $guidirs {\n\
     if {[file exists [file join $sd tclIndex]]} {\n\