gnue designer/setup.py gnuef/setup.py

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    01/11/12 16:44:45

Modified files:
        designer       : setup.py 
        gnuef          : setup.py 

Log message:
        fixes to setup.py for mcmillan install

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/setup.py.diff?cvsroot=OldCVS&tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/setup.py.diff?cvsroot=OldCVS&tr1=1.45&tr2=1.46&r1=text&r2=text

Patches:
Index: gnue/designer/setup.py
diff -u gnue/designer/setup.py:1.10 gnue/designer/setup.py:1.11
--- gnue/designer/setup.py:1.10 Sun Nov  4 17:49:08 2001
+++ gnue/designer/setup.py      Mon Nov 12 16:44:44 2001
@@ -160,9 +160,14 @@
       gnue_env = \
                "#######\n" \
              + "# The following variables were set when GNUe was 
installed\n\n"    \
-             + "INST_GNUE_CONNECTIONS='%s/etc/connections.conf'\n" % 
(sys.prefix) \
-             + "os.environ['INSTALL_PREFIX']='%s'\n" % (sys.prefix)            
   \
-             + "os.environ['INSTALL_LIB']='%s'\n" % (sys.prefix)               
   \
+             + "import os, sys\n" \
+             + "if __name__ == '__main__': \n" \
+             + "  _BASE = os.path.join(os.path.dirname(sys.argv[0]),'..')\n" \
+             + "else: \n" \
+             + "  _BASE = os.path.join(os.path.dirname(__file__),'..')\n" \
+             + 
"INST_GNUE_CONNECTIONS=os.path.join(_BASE,'etc','connections.conf')\n %% 
(_BASE)" % (sys.prefix) \
+             + "os.environ['INSTALL_PREFIX']=_BASE\n"                \
+             + "os.environ['INSTALL_LIB']=_BASE\n"                   \
              + "#######\n"  \
              + "os.putenv('PYTHONCASEOK','1')"
             
Index: gnue/gnuef/setup.py
diff -u gnue/gnuef/setup.py:1.45 gnue/gnuef/setup.py:1.46
--- gnue/gnuef/setup.py:1.45    Mon Nov  5 22:55:24 2001
+++ gnue/gnuef/setup.py Mon Nov 12 16:44:45 2001
@@ -229,13 +229,18 @@
          + "#######\n" 
     else:
       gnue_env = \
-           "#######\n" \
-         + "# The following variable were set when GNUe was installed\n\n"    \
-         + "INST_GNUE_CONNECTIONS='%s/etc/connections.conf'\n" % (sys.prefix) \
-         + "os.environ['INSTALL_PREFIX']='%s'\n" % (sys.prefix)               \
-         + "os.environ['INSTALL_LIB']='%s'\n" % (sys.prefix)                  \
-         + "#######\n" \
-         + "os.putenv('PYTHONCASEOK','1')"
+               "#######\n" \
+             + "# The following variables were set when GNUe was 
installed\n\n"    \
+             + "import os, sys\n" \
+             + "if __name__ == '__main__': \n" \
+             + "  _BASE = os.path.join(os.path.dirname(sys.argv[0]),'..')\n" \
+             + "else: \n" \
+             + "  _BASE = os.path.join(os.path.dirname(__file__),'..')\n" \
+             + 
"INST_GNUE_CONNECTIONS=os.path.join(_BASE,'etc','connections.conf')\n %% 
(_BASE)" % (sys.prefix) \
+             + "os.environ['INSTALL_PREFIX']=_BASE\n"                \
+             + "os.environ['INSTALL_LIB']=_BASE\n"                   \
+             + "#######\n"  \
+             + "os.putenv('PYTHONCASEOK','1')"
 
     for script in self.scripts:
       print "Building %s..."% (script),