Browse Source

Merge pull request #157 from trapexit/mount.mergerfs

create mount.mergerfs symlink. closes #149
pull/158/head
Antonio SJ Musumeci 9 years ago
parent
commit
6709791156
  1. 14
      Makefile
  2. 2
      debian/rules

14
Makefile

@ -116,10 +116,13 @@ $(TARGET): src/version.hpp obj/obj-stamp $(OBJ)
$(CXX) $(CFLAGS) $(OBJ) -o $@ $(LDFLAGS) $(CXX) $(CFLAGS) $(OBJ) -o $@ $(LDFLAGS)
clone: $(TARGET) clone: $(TARGET)
$(LN) -s $< $@
$(LN) -fs "$<" "$@"
fsck.mergerfs: tools/fsck.mergerfs fsck.mergerfs: tools/fsck.mergerfs
mount.mergerfs: $(TARGET)
$(LN) -fs "$<" "$@"
changelog: changelog:
$(GIT2DEBCL) --name $(TARGET) > ChangeLog $(GIT2DEBCL) --name $(TARGET) > ChangeLog
@ -149,13 +152,18 @@ clean: rpm-clean
distclean: clean distclean: clean
$(GIT) clean -fd $(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-base: $(TARGET)
$(INSTALL) -v -m 0755 -D "$(TARGET)" "$(INSTALLBINDIR)/$(TARGET)" $(INSTALL) -v -m 0755 -D "$(TARGET)" "$(INSTALLBINDIR)/$(TARGET)"
install-clone: clone 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-tools: fsck.mergerfs
$(INSTALL) -v -m 0755 -D "tools/$<" "$(INSTALLSBINDIR)/$<" $(INSTALL) -v -m 0755 -D "tools/$<" "$(INSTALLSBINDIR)/$<"

2
debian/rules

@ -8,4 +8,4 @@
dh $@ dh $@
override_dh_auto_install: override_dh_auto_install:
$(MAKE) PREFIX=$(CURDIR)/debian/mergerfs/usr install
$(MAKE) DESTDIR=$(CURDIR)/debian/mergerfs PREFIX=/usr install
Loading…
Cancel
Save