From: Uwe Hermann <redacted>
Date: Sun, 3 Mar 2013 18:57:18 +0000 (+0100)
Subject: Fixup DESTDIR usage.
X-Git-Tag: sigrok-firmware-fx2lafw-0.1.1~10
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=39ac5a27ab438ec17ff0198748141f50f08b72d8;p=sigrok-firmware-fx2lafw.git

Fixup DESTDIR usage.

Drop superfluous slash, otherwise the install directory would be e.g.

 /foo//usr/local/share/sigrok-firmware

or

 //usr/local/share/sigrok-firmware

depending on whether DESTDIR was set via "DESTDIR=/foo", or not.
---

diff --git a/hw/Makefile.inc b/hw/Makefile.inc
index cb88f52a..b9c7c375 100644
--- a/hw/Makefile.inc
+++ b/hw/Makefile.inc
@@ -46,11 +46,11 @@ $(BASENAME).ihx: fx2lafw $(RELS) $(top_builddir)/fx2lib/lib/fx2.lib $(top_buildd
 	$(AM_V_GEN)$(SDCC) -mmcs51 $(SDCC_FLAGS) -o $@ $(RELS) -L$(top_builddir)/fx2lib/lib fx2.lib interrupts/ints.lib
 
 install-data-local: $(BASENAME).fw
-	$(AM_V_at)$(MKDIR_P) $(DESTDIR)/$(FIRMWARE_DIR)
-	$(AM_V_at)$(INSTALL_DATA) $(BASENAME).fw $(DESTDIR)/$(FIRMWARE_DIR)
+	$(AM_V_at)$(MKDIR_P) $(DESTDIR)$(FIRMWARE_DIR)
+	$(AM_V_at)$(INSTALL_DATA) $(BASENAME).fw $(DESTDIR)$(FIRMWARE_DIR)
 
 uninstall-local:
-	$(AM_V_at)-rm -f $(DESTDIR)/$(FIRMWARE_DIR)/$(BASENAME).fw
+	$(AM_V_at)-rm -f $(DESTDIR)$(FIRMWARE_DIR)/$(BASENAME).fw
 
 clean-local:
 	$(AM_V_at)-rm -f *.lst *.rel *.rst *.sym *.lnk *.map *.mem *.ihx *.fw