[zaptel-commits] qwell: branch 1.4 r3869 - in /branches/1.4: Makefile firmware/Makefile

[SVN commits to the Zaptel project]

Author: qwell
Date: Thu Feb 21 17:59:39 2008
New Revision: 3869

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3869
Log:
Make firmware get properly installed again.

Modified:
    branches/1.4/Makefile
    branches/1.4/firmware/Makefile

Modified: branches/1.4/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.4/Makefile?view=diff&rev=3869&r1=3868&r2=3869
==============================================================================
--- branches/1.4/Makefile (original)
+++ branches/1.4/Makefile Thu Feb 21 17:59:39 2008
@@ -414,7 +414,7 @@
 
 install-firmware:
 ifeq ($(HOTPLUG_FIRMWARE),yes)
-	$(MAKE) -C firmware hotplug-install DESTDIR=$(DESTDIR)
+	$(MAKE) -C firmware hotplug-install DESTDIR=$(DESTDIR) HOTPLUG_FIRMWARE=$(HOTPLUG_FIRMWARE)
 endif
 
 install-libs: libs

Modified: branches/1.4/firmware/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.4/firmware/Makefile?view=diff&rev=3869&r1=3868&r2=3869
==============================================================================
--- branches/1.4/firmware/Makefile (original)
+++ branches/1.4/firmware/Makefile Thu Feb 21 17:59:39 2008
@@ -13,7 +13,7 @@
 
 .PHONY: dist-clean all uninstall have_download install
 
--include $(ASTTOPDIR)/menuselect.makeopts $(ASTTOPDIR)/makeopts
+-include ../menuselect.makeopts ../makeopts
 
 PWD:=$(shell pwd)