[pacman-dev] [PATCH 1/2] 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> --- We probably could also just add in the -f flag to the ln/cp calls, but I feel safer doing it this way. $(RM) will unconditionally expand to 'rm -f'. doc/Makefile.am | 1 + scripts/Makefile.am | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index a9aa78f..aa27b50 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 52a784a..d89fd30 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 ) -- 1.7.6.1
Since c51b9ca, ldconfig.stub is no longer generated, so we need to include it as part of the dist tarball. Signed-off-by: Dave Reisner <dreisner@archlinux.org> --- I'm not sure if automake provides a more appropriate var to assign this to, but this gets the job done. test/pacman/Makefile.am | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/test/pacman/Makefile.am b/test/pacman/Makefile.am index f96ce38..d198ba2 100644 --- a/test/pacman/Makefile.am +++ b/test/pacman/Makefile.am @@ -16,6 +16,7 @@ EXTRA_DIST = \ README \ TODO \ ChangeLog \ + ldconfig.stub \ $(check_SCRIPTS) # vim:set ts=2 sw=2 noet: -- 1.7.6.1
On Wed, Sep 14, 2011 at 2:03 PM, Dave Reisner <d@falconindy.com> wrote:
Since c51b9ca, ldconfig.stub is no longer generated, so we need to include it as part of the dist tarball. It was never actually generated, the file is brand new and I forgot to add it to this list. The patch is right, just the message is misleading.
Signed-off-by: Dave Reisner <dreisner@archlinux.org> --- I'm not sure if automake provides a more appropriate var to assign this to, but this gets the job done.
test/pacman/Makefile.am | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/test/pacman/Makefile.am b/test/pacman/Makefile.am index f96ce38..d198ba2 100644 --- a/test/pacman/Makefile.am +++ b/test/pacman/Makefile.am @@ -16,6 +16,7 @@ EXTRA_DIST = \ README \ TODO \ ChangeLog \ + ldconfig.stub \ $(check_SCRIPTS)
# vim:set ts=2 sw=2 noet: -- 1.7.6.1
participants (2)
-
Dan McGee
-
Dave Reisner