path: root/Makefile
diff options
authorGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2013-09-15 21:28:45 +0200
committerGravatar Peter Korsgaard <jacmet@sunsite.dk>2013-09-15 21:46:53 +0200
commit6f1882deb4ace9c06cd7cc769eee85db12f1ab26 (patch)
tree9250d0c37f62d5530ee2e7cd6c4146ea8b33172a /Makefile
parent1e9b983fe24fd9345df609e1f84a570208cdb45e (diff)
Makefile: make $(BUILD_DIR)/.root rule idempotent
The $(BUILD_DIR)/.root rule is executed as part of the 'dirs' target. The 'dirs' target is re-executed at every execution of 'make external-deps', and make external-deps explicitly tells make to ignore targets that have already been made (through the -B option). This means that the $(BUILD_DIR)/.root rule has to be idempotant, which was not the case this the introduction of the lib32/lib64 symbolic link. Running 'make external-deps' three times in a row was sufficient to trigger an error due to symbolic links being incorrectly created. This patch fixes that. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'Makefile')
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 861059284b..2163e95a52 100644
--- a/Makefile
+++ b/Makefile
@@ -448,9 +448,9 @@ $(BUILD_DIR)/.root:
--exclude .hg --exclude=CVS --exclude '*~' \
cp support/misc/target-dir-warning.txt $(TARGET_DIR_WARNING_FILE)
- @ln -s lib $(TARGET_DIR)/$(LIB_SYMLINK)
+ @ln -snf lib $(TARGET_DIR)/$(LIB_SYMLINK)
@mkdir -p $(TARGET_DIR)/usr
- @ln -s lib $(TARGET_DIR)/usr/$(LIB_SYMLINK)
+ @ln -snf lib $(TARGET_DIR)/usr/$(LIB_SYMLINK)
touch $@