]> sigrok.org Git - sigrok-firmware-fx2lafw.git/commitdiff
buildsystem: Obey DESTDIR when running make install
authorAlexandru Gagniuc <redacted>
Fri, 22 Feb 2013 17:38:49 +0000 (11:38 -0600)
committerUwe Hermann <redacted>
Sun, 3 Mar 2013 19:03:05 +0000 (20:03 +0100)
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.

hw/Makefile.inc

index 2925f66e935ceb66157ba7c58dc2654456f4df3e..cb88f52aa566a9b825296c416af1a3446e61f015 100644 (file)
@@ -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