diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-23 18:41:59 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-23 18:41:59 +0000 |
| commit | a3ff52d12aa7d5f4e5a138bc7c62b5f44d29e8b4 (patch) | |
| tree | 426983a93684c4294c555d7c987fd200bbc6c23d /bsdiLib.rules | |
| parent | 2ca96d133adb9063b728d9b70827ba8c750e209a (diff) | |
Merging XORG-CURRENT into trunk
Diffstat (limited to 'bsdiLib.rules')
| -rw-r--r-- | bsdiLib.rules | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bsdiLib.rules b/bsdiLib.rules index 99303fe..85a9952 100644 --- a/bsdiLib.rules +++ b/bsdiLib.rules @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/bsdiLib.rules,v 3.4 2003/10/11 09:40:12 herrb Exp $ +XCOMM $XFree86: xc/config/cf/bsdiLib.rules,v 3.3 2003/10/09 22:43:18 herrb Exp $ /* * BSDI shared library rules (converted from SVr4/Linux rules) @@ -73,7 +73,7 @@ AllTarget(Concat(lib,libname.so.rev)) @@\ @@\ Concat(lib,libname.so.rev): solist @@\ $(RM) $@~ @@\ - @SONAME=`echo $@ | sed 's/\.[^\.]*$$//'`; set -x; \ @@\ + @SONAME=`echo $@ | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; set -x; \ @@\ (cd down; $(CCENVSETUP) SharedCCLdCmd -o up/$@~ $(SHLIBLDFLAGS) \ -Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs); \ $(RM) $$SONAME; $(LN) $@ $$SONAME; \ @@ -86,7 +86,7 @@ Concat(lib,libname.so.rev): solist @@\ LinkBuildLibrary(Concat(lib,libname.so)) @@\ @@\ clean:: @@\ - @SONAME=`echo Concat(lib,libname.so.rev) | sed 's/\.[^\.]*$$//'`; \ @@\ + @SONAME=`echo Concat(lib,libname.so.rev) | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \ @@\ set -x; $(RM) $$SONAME @@\ $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so) @@ -103,7 +103,7 @@ AllTarget(Concat(lib,libname.so.rev)) @@\ @@\ Concat(lib,libname.so.rev): deplist @@\ $(RM) $@~ @@\ - @SONAME=`echo $@ | sed 's/\.[^\.]*$$//'`; set -x; \ @@\ + @SONAME=`echo $@ | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; set -x; \ @@\ (cd down; $(CCENVSETUP) SharedCCLdCmd -o up/$@~ $(SHLIBLDFLAGS) \ -Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs); \ $(RM) $$SONAME; $(LN) $@ $$SONAME; \ @@ -116,7 +116,7 @@ Concat(lib,libname.so.rev): deplist @@\ LinkBuildLibrary(Concat(lib,libname.so)) @@\ @@\ clean:: @@\ - @SONAME=`echo Concat(lib,libname.so.rev) | sed 's/\.[^\.]*$$//'`; \ @@\ + @SONAME=`echo Concat(lib,libname.so.rev) | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \ @@\ set -x; $(RM) $$SONAME @@\ $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so) |