summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--extras/init.d/Makefile.am6
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 800cdf32725..3b1c4930123 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1 +1 @@
-ChangeLog is maintained by "tla changelog".
+ChangeLog is maintained by "git log".
diff --git a/extras/init.d/Makefile.am b/extras/init.d/Makefile.am
index 66849af870b..da9bb00786d 100644
--- a/extras/init.d/Makefile.am
+++ b/extras/init.d/Makefile.am
@@ -7,9 +7,11 @@ initdir = /etc/init.d
$(GF_DISTRIBUTION):
$(mkdir_p) $(DESTDIR)$(initdir)
- cp glusterfsd-$(GF_DISTRIBUTION) $(DESTDIR)$(initdir)/glusterfsd
+ $(INSTALL_PROGRAM) $(srcdir)/glusterfsd-$(GF_DISTRIBUTION) $(DESTDIR)$(initdir)/glusterfsd
-install-data-local: $(GF_DISTRIBUTION)
+install-exec-local: $(GF_DISTRIBUTION)
+
+install-data-local:
if GF_DARWIN_HOST_OS
cp glusterfs-server.plist /Library/LaunchDaemons/com.zresearch.glusterfs.plist
endif