[tmcode commit] r307 - spine/branches/spine_2_2-devel

[oss...@gmail.com]

Author: richard
Date: Fri Nov 20 06:48:03 2009
New Revision: 307

Log:
merge from trunk

Modified:
spine/branches/spine_2_2-devel/Makefile (contents, props changed)

Modified: spine/branches/spine_2_2-devel/Makefile
==============================================================================
--- spine/branches/spine_2_2-devel/Makefile Fri Nov 20 06:46:41 2009 (r306)
+++ spine/branches/spine_2_2-devel/Makefile Fri Nov 20 06:48:03 2009 (r307)
@@ -19,12 +19,13 @@

DESTDIR ?=
PREFIX ?= /usr
-ETCDIR ?= /etc
+ETCDIR ?= /etc/spine-mgmt
+INITDIR ?= /etc/init.d
BINDIR ?= $(PREFIX)/bin
-LIBDIR ?= $(PREFIX)/lib/spine
-STATEDIR ?= /var/spine
+LIBDIR ?= $(PREFIX)/lib/spine-mgmt
+STATEDIR ?= /var/spine-mgmt
BALLDIR ?= $(STATEDIR)/configballs
-SUBDIRS = $(ETCDIR) $(STATEDIR) $(BALLDIR) $(BINDIR) $(LIBDIR)
+SUBDIRS = $(ETCDIR) $(INITDIR) $(STATEDIR) $(BALLDIR) $(BINDIR) $(LIBDIR)
MKDIR ?= /bin/mkdir
INSTALL ?= /usr/bin/install

@@ -35,17 +36,22 @@
$(MKDIR) -p -m 0755 $(DESTDIR)$$dir; \
done

-install_config: spine-config.conf scripts/cramfs-publisher.conf
+install_config: spine-mgmt.conf publisher/spine-publisher.conf.dist
for I in $^; do \
- $(INSTALL) -m 0644 $$I $(DESTDIR)$(ETCDIR); \
+ dest=`echo $$I | sed -e 's:publisher/::' -e 's:\.dist::'`; \
+ $(INSTALL) -m 0644 $$I $(DESTDIR)$(ETCDIR)/$$dest; \
done


-install_scripts: spine-config quick_template ui scripts/spine-cramfs-publish.py
+install_scripts: spine-mgmt quick_template ui publisher/spine-publisher
for I in $^; do \
$(INSTALL) -m 0755 $$I $(DESTDIR)$(BINDIR); \
done

+install_init: publisher/spine-publisher.init
+ dest=`echo $^ | sed -e 's:\.init::' -e 's:publisher/::'`; \
+ $(INSTALL) -m 0755 $$I $^ $(DESTDIR)$(INITDIR)/$$dest; \
+
install_lib:
cd lib && \
for module in `find Spine -type f -name \*.pm \( ! -path '*/Data/*' -a ! -path '*/Action/*' \)`; do \
@@ -53,6 +59,6 @@
done \
&& cd ..

-install: mkdirs install_lib install_scripts install_config
+install: mkdirs install_lib install_scripts install_config install_init

-.PHONY : all install_lib install_scripts install_config
+.PHONY : all install_lib install_scripts install_init install_config