russell: trunk r587 - /trunk/Makefile

[asterisk-gui-commits at lists.digium.com]

Author: russell
Date: Tue Apr  3 15:07:52 2007
New Revision: 587

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=587
Log:
Make the GUI Makefile respect ASTDATADIR and use that as the location of where
to look for the static-http dir.  This is what the Asterisk Makefile does.
(issue #9410)

Modified:
    trunk/Makefile

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk-gui/trunk/Makefile?view=diff&rev=587&r1=586&r2=587
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Tue Apr  3 15:07:52 2007
@@ -81,7 +81,11 @@
   endif
 endif
 
-HTTPDIR:=$(ASTVARLIBDIR)/static-http
+ifeq ($(ASTDATADIR),)
+  ASTDATADIR:=$(ASTVARLIBDIR)
+endif
+
+HTTPDIR:=$(ASTDATADIR)/static-http
 CONFIGDIR:=$(HTTPDIR)/config
 
 HTTPHOST?=$(shell hostname)