* Fixed Makefile; install control script to prefix.

diff --git a/Makefile b/Makefile
index e30be3fc1194ac83912b3c8f6366d0ccc6cbdc1f..d07a782a5f02a61e97189f11914d843e6826a913 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ INST_DOC ?= $(PREFIX)/share/doc/$(PROJECT)
 CFGFILE := $(PROJECT).cfg
 CFGSRC  := $(CFGFILE).example
 DOC     := README.md $(CFGSRC)
-
+CTRLSCR := $(PROJECT).sh
 BIN     := $(PROJECT)
 VERFILE := version.go
 SRC     := $(filter-out $(VERFILE),$(wildcard *.go))
@@ -21,10 +21,11 @@ SELF    := $(lastword $(MAKEFILE_LIST))
 
 GOBLD   := go build
 RM      := rm -fv
-CP      := cp -afv
+CP      := cp -afv --no-preserve=ownership
 MKDIR   := mkdir -pv
 RMDIR   := rmdir -v
 TAIL    := tail
+SED     := sed
 
 .PHONY: all version config install uninstall clean distclean
 
@@ -46,15 +47,18 @@ install: all
        @echo "installing to $(PREFIX)"
        @$(MKDIR) $(INST_BIN) $(INST_ETC) $(INST_DOC)
        @$(CP) $(BIN) $(INST_BIN)
+       @$(CP) $(CTRLSCR) $(INST_BIN)/$(CTRLSCR)
+       $(SED) -i 's:PREFIX=.*:PREFIX=$(PREFIX):' $(INST_BIN)/$(CTRLSCR)
        @$(CP) $(CFGFILE) $(INST_ETC)
        @$(CP) $(DOC) $(INST_DOC)
 
 uninstall:
        @echo "uninstalling from $(PREFIX)"
+       @-$(RM) $(INST_BIN)/$(CTRLSCR)
        @-$(RM) $(INST_BIN)/$(BIN)
        @-$(RM) $(INST_ETC)/$(CFGFILE)
        @-$(foreach D,$(DOC),$(RM) $(INST_DOC)/$(D) ;)
-       @-$(RMDIR) $(INST_DOC) |:
+       @-$(RMDIR) $(INST_DOC) ||:
 
 clean:
        @$(RM) $(BIN)