From 5a76c41236afce828b2b7c5d3d757b8789374dcd Mon Sep 17 00:00:00 2001 From: Antonio SJ Musumeci Date: Mon, 12 Oct 2015 23:43:17 -0400 Subject: [PATCH] create mount.mergerfs symlink. closes #149 --- Makefile | 14 +++++++++++--- debian/rules | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index b68d5f61..0f85f73b 100644 --- a/Makefile +++ b/Makefile @@ -116,10 +116,13 @@ $(TARGET): src/version.hpp obj/obj-stamp $(OBJ) $(CXX) $(CFLAGS) $(OBJ) -o $@ $(LDFLAGS) clone: $(TARGET) - $(LN) -s $< $@ + $(LN) -fs "$<" "$@" fsck.mergerfs: tools/fsck.mergerfs +mount.mergerfs: $(TARGET) + $(LN) -fs "$<" "$@" + changelog: $(GIT2DEBCL) --name $(TARGET) > ChangeLog @@ -149,13 +152,18 @@ clean: rpm-clean distclean: clean $(GIT) clean -fd -install: install-base install-clone install-tools install-man +install: install-base install-clone install-mount.mergerfs install-tools install-man install-base: $(TARGET) $(INSTALL) -v -m 0755 -D "$(TARGET)" "$(INSTALLBINDIR)/$(TARGET)" install-clone: clone - $(CP) -a $< "$(INSTALLBINDIR)/$<" + $(MKDIR) -p "$(INSTALLBINDIR)" + $(CP) -a "$<" "$(INSTALLBINDIR)/$<" + +install-mount.mergerfs: mount.mergerfs + $(MKDIR) -p "$(INSTALLBINDIR)" + $(CP) -a "$<" "$(INSTALLBINDIR)/$<" install-tools: fsck.mergerfs $(INSTALL) -v -m 0755 -D "tools/$<" "$(INSTALLSBINDIR)/$<" diff --git a/debian/rules b/debian/rules index 3c09339b..5bc75ab5 100755 --- a/debian/rules +++ b/debian/rules @@ -8,4 +8,4 @@ dh $@ override_dh_auto_install: - $(MAKE) PREFIX=$(CURDIR)/debian/mergerfs/usr install + $(MAKE) DESTDIR=$(CURDIR)/debian/mergerfs PREFIX=/usr install