Browse files

Subject: Fix Makefile

From: Chet Burgess <cfb@liquidreality.org>

Trac: Refs #47

Original patch was applied poorly in changeset:284.
The original patch from Jeff was correct, my patching
and merging of other changes results in a few missing
changes and some bad white space formating.

Signed-off-by: Chet Burgess <cfb@liquidreality.org>
  • Loading branch information...
1 parent c2b0fc7 commit 13a5d59b284f55b09396bbdd1b9af953c7b30a8d cfb committed Nov 12, 2009
Showing with 7 additions and 6 deletions.
  1. +7 −6 Makefile
View
13 Makefile
@@ -20,7 +20,7 @@
DESTDIR ?=
PREFIX ?= /usr
ETCDIR ?= /etc/spine-mgmt
-INITDIR ?= /etc/init.d
+INITDIR ?= /etc/init.d
BINDIR ?= $(PREFIX)/bin
LIBDIR ?= $(PREFIX)/lib/spine-mgmt
STATEDIR ?= /var/spine-mgmt
@@ -38,7 +38,8 @@ mkdirs:
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
@@ -47,9 +48,9 @@ install_scripts: spine-mgmt quick_template ui publisher/spine-publisher
$(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_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 && \
@@ -60,4 +61,4 @@ install_lib:
install: mkdirs install_lib install_scripts install_config install_init
-.PHONY : all install_lib install_scripts install_init install_config
+.PHONY : all install_lib install_scripts install_init install_config

0 comments on commit 13a5d59

Please sign in to comment.