CVS: moonbase/x11/xfree86 BUILD,1.3,1.4 POST_INSTALL,1.9,1.10

[Florin Braescu]

Update of /var/cvs/lunar/moonbase/x11/xfree86
In directory dbguin.lunar-linux.org:/tmp/cvs-serv16768

Modified Files:
	BUILD POST_INSTALL 
Log Message:
moved the rm on old zlib stuff from POST_INSTALL file to the BUILD file. Thanks to Elaine for the suggestion.


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/x11/xfree86/BUILD,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- BUILD	4 Mar 2003 04:31:19 -0000	1.3
+++ BUILD	1 Dec 2003 11:57:07 -0000	1.4
@@ -26,10 +26,6 @@
   echo  "#define  InstallXdmConfig    YES"  >>  config/cf/site.def
   echo  "#define  InstallXinitConfig  YES"  >>  config/cf/site.def
 
-  if  module_installed  Linux-PAM
-  then  echo  "#define  HasPam  YES"  >>  config/cf/site.def
-  fi
-
   export CFLAGS=`echo $CFLAGS | sed s/-funroll-loops//`
   export CFLAGS=`echo $CFLAGS | sed s/-ffast-math//`
   export CXXFLAGS=`echo $CXXFLAGS | sed s/-funroll-loops//`
@@ -37,38 +33,44 @@
   export CPPFLAGS=`echo $CPPFLAGS | sed s/-funroll-loops//`
   export CPPFLAGS=`echo $CPPFLAGS | sed s/-ffast-math//`
 
-  make World     &&
-  prepare_install                                                &&
-  cd $SOURCE_DIRECTORY
-  make  install                                                  &&
-  make  install.man                                              &&
-        install_drm                                              &&
-  mkdir  -p  /usr/X11R6/include/GL                               &&
-  rm     -f  /usr/X11R6/lib/libz.a                               &&
+  if  module_installed  Linux-PAM
+  then  echo  "#define  HasPam  YES"  >>  config/cf/site.def
+  fi                                    &&
+
+  make World                            &&
+  prepare_install                       &&
+  cd $SOURCE_DIRECTORY                  &&
+  make  install                         &&
+  make  install.man                     &&
+        install_drm                     &&
+  mkdir  -p  /usr/X11R6/include/GL      &&
+  rm     -f  /usr/X11R6/lib/libz.a      &&
+  rm     -f /usr/X11R6/include/zlib.h   &&
+  rm     -f /usr/X11R6/include/zconf.h  &&
 
   if  [  !  -e                      /etc/skel/.xsession  ];  then
     cp  $SCRIPT_DIRECTORY/xsession  /etc/skel/.xsession
-  fi
+  fi  &&
 
   if  [  !  -e                    /usr/bin/X11  ];  then
     ln      -sf   /usr/X11R6/bin  /usr/bin/X11
-  fi                                                             &&
+  fi  &&
 
   if  [  !  -e          /usr/X11  ];  then
     ln      -sf  X11R6  /usr/X11
-  fi                                                             &&
+  fi  &&
 
   if  [  !  -e                         /usr/include/X11  ];  then
     ln      -sf  ../X11R6/include/X11  /usr/include/X11
-  fi                                                             &&
+  fi  &&
 
   if  [  !  -e                     /usr/lib/X11  ];  then
     ln      -sf  ../X11R6/lib/X11  /usr/lib/X11
-  fi                                                             &&
+  fi  &&
 
   if  [  !  -e                     /usr/lib/libMesaGLU.so ];  then
     ln      -sf  /usr/X11R6/lib/libGLU.so.1.3 /usr/lib/libMesaGLU.so
-  fi                                                             &&
+  fi  &&
 
   if  [  !  -e                /usr/X11R6/lib/libMesaGL.so ];  then
     ln      -sf  /usr/X11R6/lib/libGL.so.1.2 /usr/X11R6/lib/libMesaGL.so

Index: POST_INSTALL
===================================================================
RCS file: /var/cvs/lunar/moonbase/x11/xfree86/POST_INSTALL,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- POST_INSTALL	13 Sep 2003 18:55:53 -0000	1.9
+++ POST_INSTALL	1 Dec 2003 11:57:07 -0000	1.10
@@ -23,12 +23,10 @@
 then  mkdir -p /usr/lib/pkgconfig
 fi 
 
-ln -sf /usr/X11R6/lib/pkgconfig/xft.pc /usr/lib/pkgconfig &&
+ln -sf /usr/X11R6/lib/pkgconfig/xft.pc /usr/lib/pkgconfig        &&
 ln -sf /usr/X11R6/lib/pkgconfig/fontconfig.pc /usr/lib/pkgconfig &&
 
 message "Running fc-cache please be patient" &&
 /usr/X11R6/bin/fc-cache -f 
 
-rm -f /usr/X11R6/include/zlib.h
 cp $SOURCE_CACHE/$SOURCE9 /usr/X11R6/lib/pkgconfig/xft.pc
-