Makefile: fix up initscript packaging

diff --git a/build_upload_debian_packages.sh b/build_upload_debian_packages.sh
index df12782360b1d9567e67c2ed6feb8c3e9fd6d0a4..a3733cfa82a3a62989ac80c9e6040d0e27f29cc1 100755 (executable)
--- 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 cc0aacbb3c2ba40f5f780b4597af288f79617f9c..bcebc8d81ef030bd504f79244bd9b6ca16ab5835 100755 (executable)
--- 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 4f04039a25011b0516825f8faba0b70829bef27d..699721454596e1bb475a32d740e656df8b7c4225 100644 (file)
--- 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