Alejandro Mery: /lib/*.{a,la} -> /usr/lib/, and a related fix to ncurses

git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1460 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc

Documentation/Developers/CHANGELOG-RENE

@@ -3,6 +3,7 @@
 
  - Jan Veninga: linux24-header-cross must also be latest linux version
                 Build-Target does not build broken-flagged packages
+ - Alejandro Mery: /lib/*.{a,la} -> /usr/lib/, and a related fix to ncurses
 
 *) 2003-09-18 (2.0.0-rc1 - 2.0.0-rc2)
 

misc/tools-source/install_wrapper.sh

@@ -58,7 +58,7 @@ done
 [ -z "${destination##/*}" ] || destination="$PWD/$destination"
 
 if [ "$filter" != " " ]; then
-	destination="$( eval "echo \"$destination\" $filter" )"
+	destination="$( eval "echo \"$destination\" | tr -s '/' $filter" )"
 fi
 
 if [ -z "$destination" ]; then

package/base/ncurses/ncurses.conf

@@ -38,6 +38,9 @@ if [ -f $root/var/adm/packages/termcap ] ; then
 	confopt="$confopt --disable-termcap"
 	inmake="remove_include_termcap"
 else
-	postmake="ln -svf libncurses.a $root/usr/lib/libtermcap.a"
+	hook_add postmake 6 "\
+		ln -svf libncurses.a $libdir/libtermcap.a; \
+		ln -svf libncurses.so $libdir/libtermcap.so"
 fi
+hook_add postmake 7 "ln -svf libncurses.so $libdir/libcurses.so"
 

package/base/ncurses/ranlib_before_install.patch

@@ -0,0 +1,40 @@
+# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+# 
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# Please add additional copyright information _after_ the line containing
+# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+# 
+# ROCK Linux: rock-src/package/base/ncurses/ranlib_before_install.patch
+# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version. A copy of the GNU General Public
+# License can be found at Documentation/COPYING.
+# 
+# Many people helped and are helping developing ROCK Linux. Please
+# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
+# file for details.
+# 
+# --- ROCK-COPYRIGHT-NOTE-END ---
+
+--- ./mk-1st.awk.orig	2003-09-18 19:21:49.000000000 -0400
++++ ./mk-1st.awk	2003-09-18 19:26:25.000000000 -0400
+@@ -306,6 +306,7 @@
+ 				print  "install.libs \\"
+ 				printf "install.%s :: $(DESTDIR)$(libdir) ../lib/%s\n", name, lib_name
+ 				printf "\t@echo installing ../lib/%s as $(DESTDIR)$(libdir)/%s\n", lib_name, lib_name
++				printf "\t$(RANLIB) ../lib/%s\n", lib_name
+ 				printf "\t$(INSTALL_DATA) ../lib/%s $(DESTDIR)$(libdir)/%s\n", lib_name, lib_name
+ 				if ( overwrite == "yes" && lib_name == "libncurses.a" )
+ 				{
+@@ -313,7 +314,6 @@
+ 					printf "\t-@rm -f $(DESTDIR)$(libdir)/libcurses.a\n"
+ 					printf "\t(cd $(DESTDIR)$(libdir) && $(LN_S) libncurses.a libcurses.a)\n"
+ 				}
+-				printf "\t$(RANLIB) $(DESTDIR)$(libdir)/%s\n", lib_name
+ 				if ( target == "vxworks" )
+ 				{
+ 					printf "\t@echo installing ../lib/lib%s.o as $(DESTDIR)$(libdir)/lib%s.o\n", name, name

scripts/Build-Pkg

@@ -239,6 +239,8 @@ fi
 export INSTALL_WRAPPER_LOGFILE="$builddir/install_wrapper.log"
 export CMD_WRAPPER_LOGFILE="$builddir/cmd_wrapper.log"
 
+var_append INSTALL_WRAPPER_FILTER '|' \
+	'sed -e "s,^'$root'/lib/\(.*\.\(a\|la\)\),'$root'/usr/lib/\1,"'
 
 if [ $norebuild = 1 -a -f $root/var/adm/logs/$stagelevel-$xpkg.log ] ; then
 	echo_pkg_deny $stagelevel $pkg "already built"