From: Alexandru Gagniuc Date: Fri, 22 Feb 2013 17:38:49 +0000 (-0600) Subject: buildsystem: Obey DESTDIR when running make install X-Git-Tag: sigrok-firmware-fx2lafw-0.1.1~11 X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=8ca25313c231a0284b214ac31f8c1179286a8cc6;p=sigrok-firmware-fx2lafw.git buildsystem: Obey DESTDIR when running make install For more details, see: http://www.gnu.org/prep/standards/html_node/DESTDIR.html http://www.gnu.org/software/automake/manual/html_node/Extending.html This closes bug #67. --- diff --git a/hw/Makefile.inc b/hw/Makefile.inc index 2925f66e..cb88f52a 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) $(FIRMWARE_DIR) - $(AM_V_at)$(INSTALL_DATA) $(BASENAME).fw $(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 $(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