Changeset 4a96d460

Timestamp:

01/03/2011 08:46:39 PM (13 years ago)

Author:

Randy McMurchy <randy@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

ab0d2f60

Parents:

be7ccc2

Message:

Added installing the environment variable PYTHONPATH to the GNOME Pre-Installation tasks, also changed hardcoded Python version instances to use an existing entity

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@8757 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• basicnet/netutils/avahi.xml (modified) (1 diff)
• general/prog/python.xml (modified) (1 diff)
• gnome/add/alacarte.xml (modified) (1 diff)
• gnome/core/gnome-menus.xml (modified) (1 diff)
• gnome/core/libgweather.xml (modified) (1 diff)
• gnome/core/pre-install-config.xml (modified) (1 diff)
• introduction/welcome/changelog.xml (modified) (1 diff)

basicnet/netutils/avahi.xml

@@ -192 +192 @@
         libavahi-ui.{so,a}</seg>
         <seg>/etc/avahi/services,/usr/{include/avahi-{client,common,core,glib,
-        gobject,ui},lib/{avahi,python2.6/site-packages/{avahi,avahi_discover}},
+        gobject,ui},lib/{avahi,python&python-majorver;/site-packages/{avahi,avahi_discover}},
         share/avahi/{interfaces,introspection}}</seg>
       </seglistitem>

general/prog/python.xml

@@ -140 +140 @@
 
 <screen role="root"><userinput>make install &amp;&amp;
-chmod -v 755 /usr/lib/libpython2.6.so.1.0</userinput></screen>
+chmod -v 755 /usr/lib/libpython&python-majorver;.so.1.0</userinput></screen>
 
     <para>There is no documentation installed using the instructions above.

gnome/add/alacarte.xml

@@ -104 +104 @@
         <seg>alacarte</seg>
         <seg><application>Python</application> modules.</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/{lib/python2.6/site-packages/Alacarte,
+        <seg><envar>$GNOME_PREFIX</envar>/{lib/python&python-majorver;/site-packages/Alacarte,
         share/{alacarte,icons/hicolor/256x256/apps,locale/bem/LC_MESSAGES}}</seg>
       </seglistitem>

gnome/core/gnome-menus.xml

@@ -153 +153 @@
 
 <screen role='root'><userinput>echo "export PYTHONPATH=\$PYTHONPATH:$(pkg-config \
---variable=prefix ORBit-2.0)/lib/python2.6/site-packages:$(pkg-config \
---variable=prefix ORBit-2.0)/lib/python2.6/site-packages/GMenuSimpleEditor" \
+--variable=prefix ORBit-2.0)/lib/python&python-majorver;/site-packages/GMenuSimpleEditor" \
 &gt;&gt; /etc/profile.d/gnome.sh</userinput></screen>
 

gnome/core/libgweather.xml

@@ -131 +131 @@
         <seg>libgweather.{so,a}</seg>
         <seg><envar>$GNOME_PREFIX</envar>/{include/libgweather,
-        lib/python2.6/site-packages/gweather/I_KNOW_THIS_IS_UNSTABLE,
+        lib/python&python-majorver;/site-packages/gweather/I_KNOW_THIS_IS_UNSTABLE,
         share/{gtk-doc/html/libgweather,libgweather}}</seg>
       </seglistitem>

gnome/core/pre-install-config.xml

@@ -53 +53 @@
 export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/gnome-&gnome-version;&gnome-minor-version;/lib/pkgconfig
 export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/gnome-&gnome-version;&gnome-minor-version;/share/pkgconfig
-export GNOME_LIBCONFIG_PATH=/usr/lib:/opt/gnome-&gnome-version;&gnome-minor-version;/lib</literal></screen>
+export GNOME_LIBCONFIG_PATH=/usr/lib:/opt/gnome-&gnome-version;&gnome-minor-version;/lib
+export PYTHONPATH=$PYTHONPATH:/opt/gnome-&gnome-version;&gnome-minor-version;/lib/python&python-majorver;/site-packages</literal></screen>
 
   <para>Add to your <filename>/etc/ld.so.conf</filename>:</para>

introduction/welcome/changelog.xml

@@ -45 +45 @@
       <para>January 3rd, 2011</para>
       <itemizedlist>
+        <listitem>
+          <para>[randy] - Added installing the environment variable PYTHONPATH
+          to the GNOME Pre-Installation tasks, also changed hardcoded Python
+          version instances to use an existing entity.</para>
+        </listitem>
         <listitem>
           <para>[randy] - Updated to GNOME Doc Utils-0.20.2.</para>