diff options
| -rw-r--r-- | make.tmpl.in | 4 | ||||
| -rw-r--r-- | man/Makefile.in | 11 | ||||
| -rw-r--r-- | tools/Makefile.in | 5 |
3 files changed, 11 insertions, 9 deletions
diff --git a/make.tmpl.in b/make.tmpl.in index 49d30e0f..a264eb7a 100644 --- a/make.tmpl.in +++ b/make.tmpl.in @@ -29,8 +29,8 @@ LN_S = @LN_S@ LIBS = @LIBS@ # Setup directory variables -prefix = @prefix@ -exec_prefix = @exec_prefix@ +prefix = $(DESTDIR)@prefix@ +exec_prefix = $(DESTDIR)@exec_prefix@ bindir = @bindir@ libdir = @libdir@ sbindir = @sbindir@ diff --git a/man/Makefile.in b/man/Makefile.in index 2608c4f2..2f05e45c 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -28,15 +28,16 @@ MAN8DIR=${mandir}/man8 include ../make.tmpl install: - @echo "*** Installing $(ALL_MANUALS) in $(DESTDIR)$(MAN8DIR) ***" + @echo "Installing $(MAN8) in $(MAN8DIR)" @for f in $(MAN8); \ do \ - $(RM) $(DESTDIR)$(MAN8DIR)/$$f; \ - @INSTALL@ -D -o $(OWNER) -g $(GROUP) -m 444 $$f $(DESTDIR)$(MAN8DIR)/$$f; \ + $(RM) $(MAN8DIR)/$$f; \ + @INSTALL@ -D -o $(OWNER) -g $(GROUP) -m 444 $$f $(MAN8DIR)/$$f; \ done + @echo "Installing $(MAN5) in $(MAN8DIR)" @for f in $(MAN5); \ do \ - $(RM) $(DESTDIR)$(MAN5DIR)/$$f; \ - @INSTALL@ -D -o $(OWNER) -g $(GROUP) -m 444 $$f $(DESTDIR)$(MAN5DIR)/$$f; \ + $(RM) $(MAN5DIR)/$$f; \ + @INSTALL@ -D -o $(OWNER) -g $(GROUP) -m 444 $$f $(MAN5DIR)/$$f; \ done diff --git a/tools/Makefile.in b/tools/Makefile.in index 2c4790bf..6f5a39b0 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -64,9 +64,10 @@ lvm: $(OBJECTS) $(top_srcdir)/lib/liblvm.a grep -v help > .commands install: $(TARGETS) - $(INSTALL) -c -o $(OWNER) -g $(GROUP) -m 555 $(STRIP) -D lvm \ + $(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 555 $(STRIP) lvm \ $(sbindir)/lvm - ( \ + @echo Creating symbolic links for individual commands in $(sbindir) + @( \ for v in `cat .commands`; do \ cd $(sbindir); \ $(LN_S) -f lvm $$v; \ |