r4366 findAutoTagWarnings(): update for spotEntity() throwing an exception

[racktables] / Makefile

diff --git a/Makefile b/Makefile
index 8bc902a649a619c30bddcb67aa722af9b58ebdbc..3d04bca14eeeea2f8391d9d9fc2dbb23e7aba043 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,15 @@
-DESTDIR ?=
-prefix  ?= /usr/local
-
-docdir    ?= $(prefix)/share/doc/racktables
+DESTDIR   ?=
+prefix    ?= /usr/local
+docdir    ?= $(prefix)/share/doc/RackTables
 datadir   ?= $(prefix)/share
-staticdir ?= $(datadir)/racktables/static
-codedir   ?= $(datadir)/racktables/code
-scriptdir ?= $(datadir)/racktables
+# Default values reproduce the layout present in tar.gz, which concurs with
+# the default values of $racktables_gwdir and $racktables_staticdir. But
+# once the latter are patched for a shared deploy, it is enough to execute
+# "make install" with appropriate arguments to split the filesystem.
+staticdir ?= $(datadir)/RackTables/wwwroot
+applibdir ?= $(datadir)/RackTables/wwwroot/inc
+indexdir  ?= $(datadir)/RackTables/wwwroot
+scriptdir ?= $(datadir)/RackTables
 
 INSTALL         := install
 INSTALL_DATA    := $(INSTALL) -m 644
@@ -27,9 +31,12 @@ install-static: wwwroot/css wwwroot/js wwwroot/pix
        cp -r $^ $(DESTDIR)$(staticdir)
        find $(DESTDIR)$(staticdir) -type d -a -name '.svn' -exec rm -rf \{\} \; -prune
 
-install-code: wwwroot/inc wwwroot/favicon.ico wwwroot/index.php
-       $(INSTALL_DIR) $(DESTDIR)$(codedir)/inc
-       $(INSTALL_DATA) wwwroot/favicon.ico wwwroot/index.php $(DESTDIR)$(codedir)
-       $(INSTALL_DATA) wwwroot/inc/*.php $(DESTDIR)$(codedir)/inc
+install-applib: wwwroot/inc
+       $(INSTALL_DIR) $(DESTDIR)$(applibdir)/inc
+       $(INSTALL_DATA) wwwroot/inc/*.php $(DESTDIR)$(applibdir)
+
+install-index: wwwroot/index.php
+       $(INSTALL_DIR) $(DESTDIR)$(indexdir)
+       $(INSTALL_DATA) wwwroot/index.php $(DESTDIR)$(indexdir)
 
-install: install-helpers install-static install-code
+install: install-helpers install-static install-applib install-index