[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[committed] Fix installation of man page from separate builddir



Hi,

When doing make install in a separate build dir, we run into:
...
$ make install DESTDIR=$(pwd -P)/../install
make -f /data/dwz/dwz.git/Makefile srcdir=/data/dwz/dwz.git install
make[1]: Entering directory '/data/dwz/build'
install -D dwz /data/dwz/build/../install/usr/bin/dwz
install -D -m 644 dwz.1 /data/dwz/build/../install/usr/share/man/man1/dwz.1
install: cannot stat 'dwz.1': No such file or directory
make[1]: *** [/data/dwz/dwz.git/Makefile:19: install] Error 1
make[1]: Leaving directory '/data/dwz/build'
make: *** [Makefile:7: install] Error 2
...

Fix this by prefixing dwz.1 with $(srcdir)/ in the install command.

Committed to trunk.

Thanks,
- Tom

Fix installation of man page from separate builddir

2019-07-02  Matthias Klose  <doko@debian.org>
	    Tom de Vries  <tdevries@suse.de>

	PR dwz/24754
	* Makefile: Prefixing dwz.1 with $(srcdir)/ in install command.

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index b2a1fb1..534fc74 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ dwz: $(OBJECTS)
 	$(CC) $(LDFLAGS) -o $@ $^ -lelf
 install: dwz
 	install -D dwz $(DESTDIR)$(bindir)/dwz
-	install -D -m 644 dwz.1 $(DESTDIR)$(mandir)/man1/dwz.1
+	install -D -m 644 $(srcdir)/dwz.1 $(DESTDIR)$(mandir)/man1/dwz.1
 clean:
 	rm -f $(OBJECTS) *~ core* dwz