From: Sage Weil <sage@newdream.net>
Date: Wed, 15 Jul 2009 21:07:04 +0000 (-0700)
Subject: Makefile: fix up initscript packaging
X-Git-Tag: v0.10~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=464d248e3549a30bb32fd925dd5f0ddbc05d735f;p=ceph.git

Makefile: fix up initscript packaging
---

diff --git a/build_upload_debian_packages.sh b/build_upload_debian_packages.sh
index df12782360b1..a3733cfa82a3 100755
--- a/build_upload_debian_packages.sh
+++ b/build_upload_debian_packages.sh
@@ -7,7 +7,7 @@ repo=$1
 arch=$2
 
 rm *.deb
-rm -r ceph-$vers
+rm -rf ceph-$vers
 make dist
 tar zxvf ceph-$vers.tar.gz
 cd ceph-$vers
diff --git a/debian/rules b/debian/rules
index cc0aacbb3c2b..bcebc8d81ef0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,6 +19,9 @@ build-stamp: configure-stamp
 	./configure --prefix=/usr
 	$(MAKE)
 
+	# LAME: 'make dist' won't include symlinks with non-existant targets.
+	cp src/init-ceph debian/ceph.init
+
 	touch $@
 clean: 
 	dh_testdir
diff --git a/src/Makefile.am b/src/Makefile.am
index 4f04039a2501..699721454596 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -232,7 +232,7 @@ noinst_LIBRARIES +=  #libcephclient_so.a
 
 # extra bits
 EXTRA_DIST = verify-mds-journal.sh vstart.sh \
-	     crun ceph_common.sh init-ceph mkcephfs make_version
+	     crun ceph_common.sh init-ceph.in mkcephfs.in make_version
 
 install-data-local:
 	$(install_sh_SCRIPT) -m 0755 mkcephfs $(DESTDIR)$(sbindir)/mkcephfs