summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-04-26 13:17:43 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:05:01 -0500
commit061dfe14d99e90a44c2dbe53e29fc7a23407b2b2 (patch)
tree301576627e31b680fe7b682c0d8937d96acd5166
parentd12e9c4c3b604f0af8fce49ca685a10474c253f8 (diff)
downloadsamba-061dfe14d99e90a44c2dbe53e29fc7a23407b2b2.tar.gz
samba-061dfe14d99e90a44c2dbe53e29fc7a23407b2b2.tar.bz2
samba-061dfe14d99e90a44c2dbe53e29fc7a23407b2b2.zip
r15278: Fix recreating symlink every time.
(This used to be commit 6f8382432f8e6fba4d7c0f629f94ad514f0cee08)
-rw-r--r--source4/heimdal_build/config.mk2
-rwxr-xr-xsource4/heimdal_build/hcrypto-deps.pl2
-rw-r--r--source4/static_deps.mk4
3 files changed, 4 insertions, 4 deletions
diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk
index cd15c442a4..8d1b6c5781 100644
--- 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 89054bf1fa..61dd832b6a 100755
--- 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 2f33c92a18..3ee1c53100 100644
--- 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 \