Browse Source

hannes:


			
			
				rocklinux
			
			
		
hannes 20 years ago
parent
commit
697b24cedc
3 changed files with 95 additions and 1 deletions
  1. +11
    -0
      package/hannes/dmapi/buildmacros.patch
  2. +1
    -1
      package/hannes/dmapi/dmapi.conf
  3. +83
    -0
      package/hannes/dmapi/install.patch

+ 11
- 0
package/hannes/dmapi/buildmacros.patch

@ -0,0 +1,11 @@
--- ./include/buildmacros.orig 2004-12-05 08:09:03.778078400 +0100
+++ ./include/buildmacros 2004-12-05 08:09:15.082359888 +0100
@@ -102,8 +102,6 @@
../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \
../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \
- ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \
- ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \
../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so
else
INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)

+ 1
- 1
package/hannes/dmapi/dmapi.conf

@ -25,4 +25,4 @@
makeinstopt="$makeinstopt install-dev"
libdir="$root/lib"
# var_append confopt ' ' "--libexecdir='$libdir'"
var_append confopt ' ' "--libexecdir='$libdir'"

+ 83
- 0
package/hannes/dmapi/install.patch

@ -0,0 +1,83 @@
# --- 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/dmapi/install.patch
# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
--- ./install-sh.orig 2002-06-05 01:07:56.000000000 +0200
+++ ./install-sh 2003-04-15 07:42:07.000000000 +0200
@@ -122,9 +122,9 @@
if $INSTALL
then
- CP=cp; LN=ln; MKDIR=mkdir; CHMOD=chmod; CHOWN=_chown
+ MV=mv; CP=cp; LN=ln; MKDIR=mkdir; CHMOD=chmod; CHOWN=_chown
else
- CP=true; LN=true; MKDIR=true; CHMOD=true; CHOWN=true
+ MV=mv; CP=true; LN=true; MKDIR=true; CHMOD=true; CHOWN=true
fi
[ -n "$DIST_ROOT" -a $REAL_UID -ne 0 ] && CHOWN=true
@@ -229,7 +229,8 @@
if [ $cnt -eq 5 ]
then
install_name=$target/$solib
- $CP $solib $install_name
+ $CP $solib $install_name.new
+ $MV $install_name.new $install_name
status=$?
$MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$solib ${install_name#$DIST_ROOT}
break
@@ -280,7 +281,8 @@
;;
old_lib)
install_name=$target/$old_library
- $CP $old_library $install_name
+ $CP $old_library $install_name.new
+ $MV $install_name.new $install_name
status=$?
$MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$old_library ${install_name#$DIST_ROOT}
;;
@@ -314,7 +316,13 @@
then
mkdir -p `dirname $dir`
fi
- $CP $f $dir
+ if test -d $dir; then
+ $CP $f $dir/${f##*/}.new
+ $MV $dir/${f##*/}.new $dir/${f##*/}
+ else
+ $CP $f $dir.new
+ $MV $dir.new $dir
+ fi
status=$?
if [ $status -eq 0 ]
then
@@ -357,7 +365,13 @@
for f in $list
do
- $CP $f $dir
+ if test -d $dir; then
+ $CP $f $dir/${f##*/}.new
+ $MV $dir/${f##*/}.new $dir/${f##*/}
+ else
+ $CP $f $dir.new
+ $MV $dir.new $dir
+ fi
status=$?
if [ $status -eq 0 ]
then

Loading…
Cancel
Save