tools/Makefile: fix install-dev target

Austin English austinenglish at gmail.com
Sun Nov 28 19:32:13 CST 2010


If you run make install-dev prefix=$FOO, where $FOO is a directory
that doesn't have a proper directory setup (so, not /usr/ or
/usr/local), the install will fail, with:
../tools/mkinstalldirs -m 755 /home/austin/blah/share/man/man1
mkdir /home/austin/blah/share
chmod 755 /home/austin/blah/share
mkdir /home/austin/blah/share/man
chmod 755 /home/austin/blah/share/man
mkdir /home/austin/blah/share/man/man1
chmod 755 /home/austin/blah/share/man/man1
/usr/bin/install -c   ./winemaker /home/austin/blah/bin/winemaker
/usr/bin/install -c  -m 644  winemaker.man
/home/austin/blah/share/man/man1/winemaker.1
/usr/bin/install -c  -m 644  winemaker.de.man
/home/austin/blah/share/man/de.UTF-8/man1/winemaker.1
/usr/bin/install: cannot create regular file
`/home/austin/blah/share/man/de.UTF-8/man1/winemaker.1': No such file
or directory
make[1]: *** [install-dev] Error 1
make[1]: Leaving directory `/home/austin/wine-git/tools'
make: *** [install-dev] Error 2

this is a regression introduced by
d53e75af1474d0bd9c8b8660827baaf8fe708f4c, but I suppose no one
noticed, since few people use install-dev, and fewer do so to an empty
directory structure.

Fixes http://bugs.winehq.org/show_bug.cgi?id=25339

-- 
-Austin
-------------- next part --------------
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 526ac1b..37ae8bb 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -81,7 +81,7 @@ install install-lib:: wine.inf wineprefixcreate $(INSTALLDIRS)
 	$(INSTALL_DATA) wineprefixcreate.man $(DESTDIR)$(mandir)/man$(prog_manext)/wineprefixcreate.$(prog_manext)
 	-$(UPDATE_DESKTOP_DATABASE)
 
-install install-dev:: $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext)
+install install-dev:: $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext) $(INSTALLDIRS)
 	$(INSTALL_SCRIPT) $(SRCDIR)/winemaker $(DESTDIR)$(bindir)/winemaker
 	$(INSTALL_DATA) winemaker.man $(DESTDIR)$(mandir)/man$(prog_manext)/winemaker.$(prog_manext)
 	$(INSTALL_DATA) winemaker.de.man $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/winemaker.$(prog_manext)


More information about the wine-patches mailing list