[Libosinfo] [libosinfo 3/3] build: Try to remove symlink before trying to create it

Christophe Fergeau cfergeau at redhat.com
Wed Mar 27 11:32:55 UTC 2013


Symlink creation fails if a file/symlink with the same name already
exists. This causes issues when installing in a tree where libosinfo
was already installed.
---
 data/Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/Makefile.am b/data/Makefile.am
index cfe1f6d..e1c8ade 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -11,7 +11,7 @@ usb.ids:
 	-wget -q -O $@ http://www.linux-usb.org/usb.ids
 else
 usb_ids_install:
-	(cd $(DESTDIR)$(pkgdatadir)/db/ && $(LN_S) $(USB_IDS) usb.ids)
+	(cd $(DESTDIR)$(pkgdatadir)/db/ && rm -f usb.ids && $(LN_S) $(USB_IDS) usb.ids)
 INSTALL_DATA_HOOK_DEPS += usb_ids_install
 endif
 
@@ -22,7 +22,7 @@ pci.ids:
 	-wget -q -O $@ http://pciids.sourceforge.net/v2.2/pci.ids
 else
 pci_ids_install:
-	(cd $(DESTDIR)$(pkgdatadir)/db/ && $(LN_S) $(PCI_IDS) pci.ids)
+	(cd $(DESTDIR)$(pkgdatadir)/db/ && rm -f pci.ids && $(LN_S) $(PCI_IDS) pci.ids)
 INSTALL_DATA_HOOK_DEPS += pci_ids_install
 endif
 
-- 
1.8.1.4




More information about the Libosinfo mailing list