public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed duplicated code for moving doc, man and info into share/ subdir.

Browse Source 
svn path=/nixpkgs/trunk/; revision=9236
This commit is contained in:
Yury G. Kudryashov 2007-09-01 18:34:16 +00:00
parent 245655b7a1
commit d215554ba4
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/stdenv/generic/setup-new-2.sh
View File

@ -715,14 +715,17 @@ fixupW() {
for d in $forceShare; do for d in $forceShare; do
if test -d "$prefix/$d"; then if test -d "$prefix/$d"; then
if test -d "$prefix/share/$d"; then if test -d "$prefix/share/$d"; then
echo "Both $d/ and share/$d/ exists, aborting" echo "Both $d/ and share/$d/ exists!"
else else
echo Fixing location of $dir/ subdirectory
ensureDir $prefix/share ensureDir $prefix/share
if test -w $prefix/share; then if test -w $prefix/share; then
mv -v $prefix/$d $prefix/share mv -v $prefix/$d $prefix/share
ln -sv share/$d $prefix ln -sv share/$d $prefix
fi fi
fi fi
else
echo "No $d/ subdirectory, skipping."
fi fi
done; done;
fi fi
@ -745,23 +748,6 @@ fixupW() {
fi fi
fi fi
if test -z "$dontFixupShare"; then
for dir in doc info man; do
if test -d "$prefix/$dir"; then
if test -d "$prefix/share/$dir"; then
echo Both "$prefix/$dir" and "$prefix/share/$dir" exists!
else
echo Fixing location of $dir/ subdirectory
ensureDir "$prefix/share"
if test -w $prefix/share; then
mv -v "$prefix/$dir" "$prefix/share"
ln -sv "share/$dir" "$prefix"
fi
fi
fi
done
fi
if test "$havePatchELF" = 1 -a -z "$dontPatchELF"; then if test "$havePatchELF" = 1 -a -z "$dontPatchELF"; then
patchELF "$prefix" patchELF "$prefix"
fi fi