Commit 35763e0b authored by Adrian Reber's avatar Adrian Reber Committed by Pavel Emelyanov

Makefile: fix libcriu.so links and man page installation

The links to the versioned libcriu.so.* included $(DESTDIR) and
$(LIBDIR) which will generate wrong links if building criu packages.
Now the links points to the correct file without any path.

For some reason criu.8 was installed with executable permission. Use
'install' with '-m 644' to make sure this does not happen.
Signed-off-by: 's avatarAdrian Reber <adrian@lisas.de>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent 459828b6
...@@ -46,6 +46,6 @@ clean: ...@@ -46,6 +46,6 @@ clean:
install: $(MANS) install: $(MANS)
$(E) " INSTALL " $(MANS) $(E) " INSTALL " $(MANS)
$(Q) mkdir -p $(DESTDIR)$(MAN8DIR) $(Q) mkdir -p $(DESTDIR)$(MAN8DIR)
$(Q) install $(MANS) $(DESTDIR)$(MAN8DIR) $(Q) install -m 644 $(MANS) $(DESTDIR)$(MAN8DIR)
.PHONY: clean install .PHONY: clean install
...@@ -241,9 +241,9 @@ install: $(PROGRAM) install-man ...@@ -241,9 +241,9 @@ install: $(PROGRAM) install-man
$(Q) mkdir -p $(DESTDIR)$(LIBDIR) $(Q) mkdir -p $(DESTDIR)$(LIBDIR)
$(Q) install -m 755 $(CRIU-LIB) \ $(Q) install -m 755 $(CRIU-LIB) \
$(DESTDIR)$(LIBDIR)/$(CRIU-SO).so.$(VERSION_SO_MAJOR).$(VERSION_SO_MINOR) $(DESTDIR)$(LIBDIR)/$(CRIU-SO).so.$(VERSION_SO_MAJOR).$(VERSION_SO_MINOR)
$(Q) ln -s $(DESTDIR)$(LIBDIR)/$(CRIU-SO).so.$(VERSION_SO_MAJOR).$(VERSION_SO_MINOR) \ $(Q) ln -s $(CRIU-SO).so.$(VERSION_SO_MAJOR).$(VERSION_SO_MINOR) \
$(DESTDIR)$(LIBDIR)/$(CRIU-SO).so.$(VERSION_SO_MAJOR) $(DESTDIR)$(LIBDIR)/$(CRIU-SO).so.$(VERSION_SO_MAJOR)
$(Q) ln -s $(DESTDIR)$(LIBDIR)/$(CRIU-SO).so.$(VERSION_SO_MAJOR).$(VERSION_SO_MINOR) \ $(Q) ln -s $(CRIU-SO).so.$(VERSION_SO_MAJOR).$(VERSION_SO_MINOR) \
$(DESTDIR)$(LIBDIR)/$(CRIU-SO).so $(DESTDIR)$(LIBDIR)/$(CRIU-SO).so
$(Q) mkdir -p $(DESTDIR)$(INCLUDEDIR) $(Q) mkdir -p $(DESTDIR)$(INCLUDEDIR)
$(Q) install -m 644 $(CRIU-INC) $(DESTDIR)$(INCLUDEDIR) $(Q) install -m 644 $(CRIU-INC) $(DESTDIR)$(INCLUDEDIR)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment