From: Sage Weil <sage@newdream.net>
Date: Mon, 2 Mar 2009 05:31:10 +0000 (-0800)
Subject: makefile: cleanup, some sample conf files
X-Git-Tag: v0.7~88
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=861155bc4990f66b9ae436686aa8750774af3575;p=ceph.git

makefile: cleanup, some sample conf files

They're in /etc/conf/sample.*.conf, when technically they should probably
be in /usr/doc/ceph or something?  Not sure.
---

diff --git a/src/Makefile.am b/src/Makefile.am
index bf4771b6ebe2..4fdc9c03e802 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -53,7 +53,6 @@ sbin_PROGRAMS = \
 	mount.ceph
 
 bin_SCRIPTS = crun
-sbin_SCRIPTS = mkcephfs
 
 testmsgr_SOURCES = testmsgr.cc msg/SimpleMessenger.cc
 testmsgr_LDADD = libcommon.a
@@ -167,16 +166,16 @@ noinst_LIBRARIES += libcrush_so.a #libcephclient_so.a
 
 # extra bits
 EXTRA_DIST = verify-mds-journal.sh vstart.sh \
-	     crun ceph_common.sh ceph-daemons
+	     crun ceph_common.sh ceph-daemons mkcephfs
 
 install-data-local:
+	$(install_sh_SCRIPT) -m 0755 mkcephfs $(DESTDIR)$(sbindir)/mkcephfs
 	mkdir -p $(DESTDIR)$(libdir)/ceph
 	$(install_sh_SCRIPT) -m 0755 ceph_common.sh $(DESTDIR)$(libdir)/ceph/ceph_common.sh
-	$(install_sh_SCRIPT) -m 0600 sample.ceph.conf $(DESTDIR)$(libdir)/ceph/sample.ceph.conf
-	$(install_sh_SCRIPT) -m 0600 sample.cluster.conf $(DESTDIR)$(libdir)/ceph/sample.cluster.conf
 	mkdir -p $(DESTDIR)$(sysconfdir)/init.d
 	$(install_sh_SCRIPT) -m 0755 ceph-daemons $(DESTDIR)$(sysconfdir)/init.d/ceph-daemons
-	$(install_sh_SCRIPT) -m 0755 ceph-daemons $(DESTDIR)$(sysconfdir)/init.d/ceph-daemons
+	$(install_sh_SCRIPT) -m 0600 sample.ceph.conf $(DESTDIR)$(sysconfdir)/ceph/sample.ceph.conf
+	$(install_sh_SCRIPT) -m 0600 sample.cluster.conf $(DESTDIR)$(sysconfdir)/ceph/sample.cluster.conf
 
 # cleaning
 clean-local:
@@ -566,4 +565,6 @@ noinst_HEADERS = \
         osdc/Filer.h\
         osdc/Journaler.h\
         osdc/ObjectCacher.h\
-        osdc/Objecter.h
+        osdc/Objecter.h\
+	sample.ceph.conf\
+	sample.cluster.conf