diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2007-09-01 18:34:16 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2007-09-01 18:34:16 +0000 |
| commit | d215554ba4ff50ac730b56714e800ee3133faa3e (patch) | |
| tree | c100b2551f32fd6f3ef2c614bb012865ff9c7b99 /pkgs/stdenv | |
| parent | 245655b7a16d2030a8768bd8158042b6b5e7412e (diff) | |
| download | nixpkgs-d215554ba4ff50ac730b56714e800ee3133faa3e.tar nixpkgs-d215554ba4ff50ac730b56714e800ee3133faa3e.tar.gz nixpkgs-d215554ba4ff50ac730b56714e800ee3133faa3e.tar.bz2 nixpkgs-d215554ba4ff50ac730b56714e800ee3133faa3e.tar.lz nixpkgs-d215554ba4ff50ac730b56714e800ee3133faa3e.tar.xz nixpkgs-d215554ba4ff50ac730b56714e800ee3133faa3e.tar.zst nixpkgs-d215554ba4ff50ac730b56714e800ee3133faa3e.zip | |
Removed duplicated code for moving doc, man and info into share/ subdir.
svn path=/nixpkgs/trunk/; revision=9236
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/generic/setup-new-2.sh | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/pkgs/stdenv/generic/setup-new-2.sh b/pkgs/stdenv/generic/setup-new-2.sh index 60a0b9c432b..fa027c0175a 100644 --- a/pkgs/stdenv/generic/setup-new-2.sh +++ b/pkgs/stdenv/generic/setup-new-2.sh @@ -715,14 +715,17 @@ fixupW() { for d in $forceShare; do if test -d "$prefix/$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 + echo Fixing location of $dir/ subdirectory ensureDir $prefix/share if test -w $prefix/share; then mv -v $prefix/$d $prefix/share ln -sv share/$d $prefix fi fi + else + echo "No $d/ subdirectory, skipping." fi done; fi @@ -745,23 +748,6 @@ fixupW() { 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 patchELF "$prefix" fi |