summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2011-09-13 07:47:11 -0400
committerDan McGee <dan@archlinux.org>2011-09-14 17:18:07 -0500
commit68856755c4f18affb513d93ec94fa9307c31473a (patch)
treed4f6fb6f8d5c8e33b8c229d67625b0967d02cd57
parenta2356d5ae3cdc6ac28ed614e0e5e7e75174728e9 (diff)
downloadpacman-68856755c4f18affb513d93ec94fa9307c31473a.tar.xz
buildsys: remove existing symlinks before installing
This fixes build errors when performing a manual install straight to a filesystem where the files already exist. Reported-by: Sergej Pupykin <ml@sergej.pp.ru> Signed-off-by: Dave Reisner <dreisner@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--doc/Makefile.am1
-rw-r--r--scripts/Makefile.am2
2 files changed, 3 insertions, 0 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
index a9aa78f8..aa27b506 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -153,6 +153,7 @@ repo-remove.8: repo-add.8
install-data-hook:
cd $(DESTDIR)$(mandir)/man8 && \
+ $(RM) repo-remove.8 && \
( $(LN_S) repo-add.8 repo-remove.8 || \
ln repo-add.8 repo-remove.8 || \
cp repo-add.8 repo-remove.8 )
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 52a784ab..d89fd306 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -106,10 +106,12 @@ repo-elephant: $(srcdir)/repo-add.sh.in
install-data-hook:
cd $(DESTDIR)$(bindir) && \
+ $(RM) repo-elephant && \
( $(LN_S) repo-add repo-elephant || \
ln repo-add repo-elephant || \
cp repo-add repo-elephant )
cd $(DESTDIR)$(bindir) && \
+ $(RM) repo-remove && \
( $(LN_S) repo-add repo-remove || \
ln repo-add repo-remove || \
cp repo-add repo-remove )