r15278: Fix recreating symlink every time.

(This used to be commit 6f8382432f8e6fba4d7c0f629f94ad514f0cee08)

diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk
index cd15c442a48930041f93bc66e1b33b3716efaa12..8d1b6c5781059ed597e48ff27b8057b9915c3a1d 100644 (file)
--- a/source4/heimdal_build/config.mk
+++ b/source4/heimdal_build/config.mk
@@ -459,7 +459,7 @@ heimdal/lib/roken/err.h: heimdal/lib/roken/err.hin
 include perl_path_wrapper.sh hcrypto-deps.pl heimdal/lib/des/*.h|
 
 heimdal/lib/des/hcrypto: 
-       rm -f $@; ln -s ./../des $@
+       @rm -f $@; ln -s ./../des $@
 
 clean::        
        @-rm -f heimdal/lib/roken/vis.h heimdal/lib/roken/err.h

diff --git a/source4/heimdal_build/hcrypto-deps.pl b/source4/heimdal_build/hcrypto-deps.pl
index 89054bf1fa7b8cc305fafbc78ad1d95e3158a23d..61dd832b6ac9c251263ca31c93ad402bc7e9db51 100755 (executable)
--- a/source4/heimdal_build/hcrypto-deps.pl
+++ b/source4/heimdal_build/hcrypto-deps.pl
@@ -5,5 +5,5 @@ foreach (@ARGV) {
        my $old = $_;
        my $new = $old; $new =~ s/des/des\/hcrypto/g;
        my $dir = $old; 
-       print "$new: $old heimdal/lib/des/hcrypto\n";
+       print "$new: heimdal/lib/des/hcrypto\n";
 }

diff --git a/source4/static_deps.mk b/source4/static_deps.mk
index 2f33c92a18ab487b2a6f35c71ec4b68733ece71b..3ee1c5310026404f286398e7f15cd4018ec10dee 100644 (file)
--- a/source4/static_deps.mk
+++ b/source4/static_deps.mk
@@ -26,8 +26,8 @@ heimdal_basics: \
        heimdal/lib/hdb/hdb_err.h \
        heimdal/lib/krb5/heim_err.h \
        heimdal/lib/krb5/k524_err.h \
-       heimdal/lib/krb5/krb5_err.h
-       rm -f heimdal/lib/des/hcrypto ; ln -s ./../des heimdal/lib/des/hcrypto
+       heimdal/lib/krb5/krb5_err.h \
+       heimdal/lib/des/hcrypto
 
 proto: basics
 basics: include/includes.h \